Merge remote-tracking branch 'origin/dev' into dev

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

@@ -57,7 +57,6 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.REFUNDARRIVAL.getCode());
         depositRefundRecord.setIscomplete(false);
-        depositRefundRecord.setRestAmount(depositRefundRecord.getTotalAmount().subtract(depositRefundRecord.getAmount()));
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.VIOLATIONARRIVAL.getCode());
         depositRefundRecord.setRestAmount(getAmount());
@@ -69,12 +68,12 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
      * @param depositRefundRecord
      */
     @Transactional
-    public void saveFixLossRecord(DepositRefundRecord depositRefundRecord) {
+    public void saveFixLossRecord(DepositRefundRecord depositRefundRecord, Boolean complete) {
         log.info("定损还车，添加押金记录： depositRefundRecord = {}", depositRefundRecord.toString());
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSS.getCode());
         depositRefundRecord.setIscomplete(true);
         insertSelectiveRe(depositRefundRecord);
-        depositRefundRecord.setIscomplete(false);
+        depositRefundRecord.setIscomplete(complete);
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUND.getCode());
         insertSelectiveRe(depositRefundRecord);
         depositRefundRecord.setStatus(DepositRefundStatus.FIXLOSSREFUNDARRIVAL.getCode());

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

@@ -220,7 +220,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.getEndTime());
             if (!flag) {
-                return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
+                return ObjectRestResponse.createFailedResult(3502, "已超过预定还车时间，不能进行交车操作！");
             }
             if (null == userDTO.getCompanyId() || !userDTO.getCompanyId().equals(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
@@ -232,12 +232,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         Vehicle vehicle = null;
         RestResponse<Vehicle> vehicleRestResponse = vehicleFeign.findById(orderRentVehicleDetail.getVehicleId());
+        log.info("获取车辆信息返回消息：{}", vehicleRestResponse.getMessage());
         if (vehicleRestResponse.getData() != null) {
             vehicle = vehicleRestResponse.getData();
-        }
-        if (vehicle == null) {
+        } else {
             return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc());
         }
+        //非定损状态下要判断车辆公里数
         if (baseOrder.getStatus() != -1) {
             if (vehicle.getMileageLastUpdate() != null) {
                 //判断车辆公里数
@@ -379,6 +380,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown, AppUserDTO appUserDTO) {
         //交车完成 设置订单状态为出行中
+        BigDecimal illegalReserve = getAmount();
         BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
@@ -386,21 +388,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             orderMsgBiz.handelMsgWait(orderRentVehicleDetail, null, null, baseOrder, appUserDTO);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.getCode()) { //还车
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
-                //添加非定损记录
-                Integer orderId = baseOrder.getId();
-                List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(new OrderVehicleCrosstownDto() {{
-                    setOrderId(orderId);
-                    setType(CrosstownTypeEnum.ARRIVE.getCode());
-                }});
-                if (list != null && list.size() > 0) {
-                    OrderVehicleCrosstownDto orderVehicleCrosstownDto = list.get(0);
-                    OrderVehicleCrosstown orderVehicleCrosstown1 = new OrderVehicleCrosstown();
-                    BeanUtil.copyProperties(orderVehicleCrosstownDto, orderVehicleCrosstown1, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-                    //添加押金记录
+                    //添加非定损押金记录
                     DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                     depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-                    depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown1.getDeductionCost()));
-                    depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                    depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
+                    depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                     depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
                     orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                     //修改订单状态为已完成
@@ -410,28 +402,28 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     orderRentVehicleDetail.setFixedLossStatus(0);
                     orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                     baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
-                }
-            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
+            } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //延时定损还车，只添加定损记录
                 //添加定损记录
                 DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                 depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-                depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-                depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
+                depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, false);
                 //修改訂單狀態為定損
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
                 baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS_NOW.getCode()) { //直接定损还车
+                //添加定损押金记录
                 orderVehicleCrosstown.setType(CrosstownTypeEnum.FIXED_LOSS.getCode());
                 DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                 depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-                depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-                depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                depositRefundRecord.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
+                depositRefundRecord.setTotalAmount(totalAmount.subtract(illegalReserve));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord, true);
                 //修改訂單狀態為已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
@@ -448,8 +440,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.updateSelectiveByIdRe(depositRefundRecord);
                 newValue.setIscomplete(true); //发起退款显示
                 newValue.setAmount(orderVehicleCrosstown.getDeductionCost());
-                newValue.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-                newValue.setTotalAmount(totalAmount.subtract(getAmount()));
+                newValue.setRestAmount(totalAmount.subtract(illegalReserve).subtract(orderVehicleCrosstown.getDeductionCost()));
+                newValue.setTotalAmount(totalAmount.subtract(illegalReserve));
                 newValue.setCrosstownId(orderVehicleCrosstown.getId());
                 newValue.setId(null);
                 orderDepositRefundRecordBiz.save(newValue);