修改提前还车逻辑

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderViolateEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderViolateEnum {
+    BEFORE(1, "提前"),
+    AFTER(2, "延期")
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    public static Map<Integer, OrderTypeEnum> codeAndDesc = new HashMap<Integer, OrderTypeEnum>();
+    //Maps.newHashMap();
+
+    static{
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(), enumE);
+        }
+    }
+
+    OrderViolateEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+
+    public static OrderTypeEnum get(Integer code) {
+        for(OrderTypeEnum enumE : OrderTypeEnum.values()) {
+            if (enumE.getCode().equals(code)) {
+                return enumE;
+            }
+        }
+        return null;
+    }
+}

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

@@ -105,6 +105,13 @@ public class OrderVehicleCrosstown {
      */
     private String dedDetail;
 
+
+    /**
+     * 租车违约金明细
+     */
+    @Column(name = "violate_amount_detail")
+    private String violateDetail;
+
     /**
      *  1、交车， 2、还车, 3、定损还车
      */

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

@@ -13,12 +13,12 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
-import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.OrderVehicaleCrosstownMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
@@ -74,6 +74,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     @Autowired
     BaseOrderBiz baseOrderBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
     public OrderVehicleCrosstown get(Integer id) {
         return selectById(id);
     }
@@ -289,63 +295,72 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     private void handleOrderStatus(BaseOrder baseOrder, OrderRentVehicleDetail orderRentVehicleDetail, OrderVehicleCrosstown orderVehicleCrosstown) {
         //交车完成 设置订单状态为出行中
-        BigDecimal totalAmount = new BigDecimal(0);
-        ObjectRestResponse<OrderPageVO> objectRestResponse = baseOrderBiz.getOrderDetail(baseOrder.getNo());
-        if (objectRestResponse.getData() != null && objectRestResponse.getData().getOrderRentVehicleDetail() != null) {
-            //总押金
-            totalAmount = objectRestResponse.getData().getOrderRentVehicleDetail().getDeposit();
-        }
-
+        BigDecimal totalAmount = orderRentVehicleDetail.getDeposit();
         if (baseOrder.getStatus() == OrderStatusEnum.ORDER_TOSTART.getCode()) {//交车
             baseOrder.setStatus(OrderStatusEnum.ORDER_WAIT.getCode());
             baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_WAIT.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()) { //定损还车，添加定损记录
-                //提前还车,结束时间大于当前时间
-                DateTime nowTime = DateTime.now();
-                DateTime endTime = new DateTime(orderRentVehicleDetail.getEndTime());
-                DateTime startTime = new DateTime(orderRentVehicleDetail.getStartTime());
-                //实际预定的天数
-                int actualDay = getDaysBetweenDateTime(startTime, endTime);
-                if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
-                    //提前的天数
-                    int noUsedDay = getDaysBetweenDateTime(nowTime, endTime);
-                    //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
-
-                    //延期还车,结束时间小于当前时间
-                } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {
-                    //延期的天数, 延期违约金是延期天数*200%
-                    int usedDay = getDaysBetweenDateTime(endTime, nowTime);
-                    DedDetailDTO dedDetailDTO = new DedDetailDTO();
-                    dedDetailDTO.setDeductions("违约金:");
-                    dedDetailDTO.setCost(baseOrder.getGoodsAmount().multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2)));
-                    dedDetailDTO.setId(1);
-                    dedDetailDTO.setStatusIndex(1);
-                    dedDetailDTO.setStatusName("延期违约金");
-                    dedDetailDTO.setType(3);
-                    orderVehicleCrosstown.setDedDetail(JSONObject.toJSONString(dedDetailDTO));
-                    BigDecimal restDeposit = orderVehicleCrosstown.getRestDeposit().subtract(dedDetailDTO.getCost());
-                    orderVehicleCrosstown.setRestDeposit(restDeposit);
-                    orderVehicleCrosstown.setDeductionCost(orderVehicleCrosstown.getDeductionCost().add(dedDetailDTO.getCost()));
-                    orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
-
+            //提前还车,结束时间大于当前时间
+            DateTime nowTime = DateTime.now();
+            DateTime endTime = new DateTime(orderRentVehicleDetail.getEndTime());
+            DateTime startTime = new DateTime(orderRentVehicleDetail.getStartTime());
+            //实际预定的天数
+            int actualDay = getDaysBetweenDateTime(startTime, endTime);
+            if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
+                //提前的天数
+                int noUsedDay = getDaysBetweenDateTime(nowTime, endTime);
+                //退还未使用的天数，或者金额，扣除违约金，实际未使用天数的金额，最多3000元
+                InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, actualDay - noUsedDay);
+                if (inProgressVO != null) {
+                    baseOrder.setViolateAmount(inProgressVO.getViolateAmount());
+                    baseOrder.setExtraAmount(inProgressVO.getExtraAmount());
+                    if (inProgressVO.getBackCoupons() != null && inProgressVO.getBackCoupons().size() > 0) {
+                        StringBuilder backCoupons = new StringBuilder();
+                        inProgressVO.getBackCoupons().forEach((a) -> backCoupons.append(a + ","));
+                        baseOrder.setBackCoupon(backCoupons.toString());
+                    }
+                }
+                BigDecimal cost = new BigDecimal(0);
+                cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
+                updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.AFTER.getCode());
+                //延期还车,结束时间小于当前时间
+            } else if (orderRentVehicleDetail.getEndTime() < nowTime.getMillis()) {
+                //延期的天数, 延期违约金是延期天数*200%
+                int usedDay = getDaysBetweenDateTime(endTime, nowTime);
+                Integer orderId = baseOrder.getId();
+                List<OrderItem> items = orderItemBiz.selectList(new OrderItem() {{
+                    setOrderId(orderId);
+                }});
+                BigDecimal amount = new BigDecimal(0);
+                if (items != null && items.size() > 0) {
+                    for (OrderItem orderItem : items) {
+                        if (orderItem.getType() == ItemTypeEnum.VEHICLE_MODEL.getCode()) {
+                            amount = orderItem.getUnitPrice();
+                            break;
+                        }
+                    }
                 }
+                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());
@@ -386,6 +401,28 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
     }
 
+    public void updateCrossRefund(OrderVehicleCrosstown orderVehicleCrosstown, BigDecimal cost, Integer type) {
+        DedDetailDTO dedDetailDTO = new DedDetailDTO();
+        String detailName = null;
+        if (type == OrderViolateEnum.BEFORE.getCode()) {
+            dedDetailDTO.setType(OrderViolateEnum.BEFORE.getCode());
+            detailName = "提前还车违约金";
+        } else if (type == OrderViolateEnum.AFTER.getCode()) {
+            dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
+            detailName = "延期还车违约金";
+        }
+        dedDetailDTO.setDeductions(detailName);
+        dedDetailDTO.setCost(cost);
+        dedDetailDTO.setId(1);
+        dedDetailDTO.setStatusIndex(1);
+        dedDetailDTO.setStatusName(detailName);
+        orderVehicleCrosstown.setViolateDetail(JSONObject.toJSONString(dedDetailDTO));
+        BigDecimal restDeposit = orderVehicleCrosstown.getRestDeposit().subtract(dedDetailDTO.getCost());
+        orderVehicleCrosstown.setRestDeposit(restDeposit);
+        orderVehicleCrosstown.setDeductionCost(orderVehicleCrosstown.getDeductionCost().add(dedDetailDTO.getCost()));
+        orderVehicleCrosstownBiz.updateSelectiveByIdRe(orderVehicleCrosstown);
+    }
+
 
     //添加订单驾驶人信息
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {