Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -261,15 +261,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
         }
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
-        orderVehicleCrosstownDto.setDeductionCost(amount);
-        //扣除费用
-        orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
-        if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
-            return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
-        }
         //出车成功后修改订单状态
         List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
         if (oldValue.size() == 1) {
+            orderVehicleCrosstownDto.setDeductionCost(oldValue.get(0).getDeductionCost().add(amount));
+            //扣除费用
+            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
+            }
             BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
@@ -280,6 +280,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
+            orderVehicleCrosstownDto.setDeductionCost(amount);
+            //扣除费用
+            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
+            }
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
@@ -343,36 +349,46 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2));
                 updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.AFTER.getCode());
             }
-        }
 
-        if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
-            //添加非定损记录
-            DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
-            depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-            depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-            depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
-            depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
-            orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
-            //修改订单状态为已完成
-            baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-            baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
-            //修改订单详情是否押金全部退还
-            orderRentVehicleDetail.setFixedLossStatus(0);
-            orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
-            baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
-        } 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.setCrosstownId(orderVehicleCrosstown.getId());
-            orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
-            //修改訂單狀態為定損
-            baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
-            baseOrderBiz.updateSelectiveByIdReT(baseOrder);
-            orderRentVehicleDetail.setFixedLossStatus(1);
-            orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+            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.setCrosstownId(orderVehicleCrosstown.getId());
+                    orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
+                    //修改订单状态为已完成
+                    baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+                    baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                    //修改订单详情是否押金全部退还
+                    orderRentVehicleDetail.setFixedLossStatus(0);
+                    orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+                    baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
+                }
+            } 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.setCrosstownId(orderVehicleCrosstown.getId());
+                orderDepositRefundRecordBiz.saveFixLossRecord(depositRefundRecord);
+                //修改訂單狀態為定損
+                baseOrder.setStatus(OrderStatusEnum.ORDER_FIXED_LOSS.getCode());
+                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                orderRentVehicleDetail.setFixedLossStatus(1);
+                orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+            }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());
             if (depositRefundRecord != null) {
@@ -401,6 +417,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
     }
 
+
     public void updateCrossRefund(OrderVehicleCrosstown orderVehicleCrosstown, BigDecimal cost, Integer type) {
         DedDetailDTO dedDetailDTO = new DedDetailDTO();
         String detailName = null;