Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderRentVehicleDetail.java

@@ -416,6 +416,10 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "交通违章押金")
 	private BigDecimal trafficDeposit;
 
+	public void setTrafficDeposit(BigDecimal trafficDeposit) {
+		this.trafficDeposit = trafficDeposit;
+	}
+
 	@Column(name = "vehicle_manage_branch_id")
 	@ApiModelProperty(value = "车辆隶属企业id")
 	private Long vehicleManageBranchId;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/account/OrderAccountDetail.java

@@ -26,6 +26,10 @@ public class OrderAccountDetail {
      */
     BigDecimal originDepositAmount = BigDecimal.ZERO;
 
+    public void setOriginDepositAmount(BigDecimal originDepositAmount) {
+        this.originDepositAmount = originDepositAmount;
+    }
+
     /**
      * 扣款列表
      */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -248,8 +248,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		}
 
 		//设置保留金
-		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+		BigDecimal illegalReserve = orderPageVo.getOrderRentVehicleDetail().getTrafficDeposit();
 		orderPageVo.setIllegalReserve(illegalReserve);
 		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
@@ -316,8 +317,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		}
 
 		//设置保留金
-		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+		BigDecimal illegalReserve = orderPageVo.getOrderRentVehicleDetail().getTrafficDeposit();
 		orderPageVo.setIllegalReserve(illegalReserve);
 		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
@@ -690,8 +692,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 		}
 		//设置保留金
-		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+		BigDecimal illegalReserve = orderPageVo.getOrderRentVehicleDetail().getTrafficDeposit();
 		orderPageVo.setIllegalReserve(illegalReserve);
 		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -380,8 +380,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @param orderMQDTO
      */
     public void refundPartDeposit(OrderMQDTO orderMQDTO){
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
+
+        BigDecimal illegalReserve = orderMQDTO.getOrderRentVehicleDetail().getTrafficDeposit();
 
         //未退还， 进行挂起保留违章预备金 的退还
         if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderDepositRefundRecordBiz.java

@@ -50,7 +50,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
      * 添加正常记录
      */
     @Transactional
-    public void saveNormalRecord(DepositRefundRecord depositRefundRecord) {
+    public void saveNormalRecord(DepositRefundRecord depositRefundRecord, BigDecimal trafficDeposit) {
         depositRefundRecord.setStatus(DepositRefundStatus.INITIATEREFUND.getCode());
         depositRefundRecord.setIscomplete(true);
         insertSelectiveRe(depositRefundRecord);
@@ -58,7 +58,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         depositRefundRecord.setIscomplete(false);
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());
-        depositRefundRecord.setRestAmount(getAmount());
+        depositRefundRecord.setRestAmount(trafficDeposit);
         insertSelectiveRe(depositRefundRecord);
     }
 
@@ -67,7 +67,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
      * @param depositRefundRecord
      */
     @Transactional
-    public void saveFixLossRecord(DepositRefundRecord depositRefundRecord, Boolean complete) {
+    public void saveFixLossRecord(DepositRefundRecord depositRefundRecord, Boolean complete, BigDecimal trafficDeposit) {
         log.info("定损还车，添加押金记录： depositRefundRecord = {}", depositRefundRecord.toString());
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSS.getCode());
         depositRefundRecord.setIscomplete(true);
@@ -79,7 +79,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());
-        depositRefundRecord.setRestAmount(getAmount());
+        depositRefundRecord.setRestAmount(trafficDeposit);
         insertSelectiveRe(depositRefundRecord);
     }
 
@@ -149,12 +149,12 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         log.info("添加违章押金记录：" + logInfo);
     }
 
-    public BigDecimal getAmount() {
-        //设置保留金
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
-        return illegalReserve;
-    }
+//    public BigDecimal getAmount() {
+//        //设置保留金
+//        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//        return illegalReserve;
+//    }
 
     public void insertDeposit(OrderVehicleCrosstownDto orderVehicleCrosstownDto, OrderViolation orderViolation,  String logInfo) {
         DepositRefundRecord depositRefundRecord = findByCrossIdAndStatus(orderVehicleCrosstownDto.getId(), DepositRefundStatus.VIOLATIONARRIVAL.getCode());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -397,7 +397,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             orderVehicleCrosstownDto.setDeductionCost(amount);
             //扣除费用
             orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(orderRentVehicleDetail.getTrafficDeposit()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
             }
             if(StringUtils.isNotBlank(oldValue.get(0).getCheckUserInfo())) {
@@ -422,7 +422,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             orderVehicleCrosstownDto.setDeductionCost(amount);
             //剩余押金 = 总押金 - 扣除费用
             orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(orderRentVehicleDetail.getTrafficDeposit()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
             }
             orderVehicleCrosstownDto.setCheckUserInfo(list.toJSONString());
@@ -443,7 +443,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown, AppUserDTO appUserDTO) {
         //交车完成 设置订单状态为出行中
-        BigDecimal illegalReserve = getAmount();
+        BigDecimal illegalReserve = orderRentVehicleDetail.getTrafficDeposit();
         BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
@@ -457,7 +457,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
                     depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                     depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                    orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
+                    orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord, orderRentVehicleDetail.getTrafficDeposit());
                     //修改订单状态为已完成
                     baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                     baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
@@ -472,7 +472,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
                 depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, false);
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, false, orderRentVehicleDetail.getTrafficDeposit());
                 //修改订单状态为定损
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
@@ -486,7 +486,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
                 depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, true);
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, true, orderRentVehicleDetail.getTrafficDeposit());
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
@@ -538,12 +538,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
     }
 
-    public BigDecimal getAmount() {
-        //设置保留金
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
-        return illegalReserve;
-    }
+//    public BigDecimal getAmount() {
+//        //设置保留金
+//        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//        return illegalReserve;
+//    }
 
     /**
      * 当前时间大于预定开始时间当天0点，小于结束时间当天时间24点 2019.11.04

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -567,7 +567,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
-        rvp.setDeposit(vehicle.getDeposit());
+        rvp.setDeposit(depositAmount);
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setDamageSafePrice(DAMAGE_SAFE);
         rvp.setModelName(vehicle.getName());