修改回原来的代码

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

@@ -5,8 +5,9 @@ import java.util.Map;
 
 public enum DeductionTypeEnum {
     //账款类型 1--违约金；2--消费金额；3--赔偿金（定损）；4--违章扣款
-    VIOLATE(1, "违约金"),
-    EXTRA(2, "消费金额"),
+    VIOLATE_CANCEL(101, "提前取消违约金"),
+    VIOLATE_ADVANCE(102, "提前还车违约金"),
+    EXTRA(201, "消费金额"),
     DAMAGES(3, "赔偿金（定损）"),
     VIOLATE_TRAFFIC(4, "违章扣款"),
     KEEP_VIOLATE_TRAFFIC(5, "违章扣款保留金"),

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

@@ -315,4 +315,12 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "back_free_days")
 	Integer backFreeDays;
 
+	@ApiModelProperty(value = "违章金额")
+	@Column(name = "violate_traffic_amount")
+	BigDecimal violateTrafficAmount;
+
+	@ApiModelProperty(value = "使用天数")
+	@Column(name = "used_day")
+	Integer usedDay;
+
 }

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

@@ -8,12 +8,14 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.IntervalUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
+import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -61,9 +63,15 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
+    @Autowired
+    OrderItemBiz orderItemBiz;
+
     @Autowired
     OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
 
+    @Autowired
+    OrderCalculateBiz orderCalculateBiz;
+
     @Autowired
     ThirdFeign thirdFeign;
 
@@ -180,7 +188,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     set("ga", goodsAmount);
                 }})).toString());
                 refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
-                orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE, OrderAccountDeduction.ORIGIN_DEPOSIT));
+                orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
                 break;
             }
         }
@@ -271,6 +279,11 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 setType(crosstownTypeEnum);
             }});
 
+            OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                setOrderId(orderMQDTO.getId());
+            }});
+
             if(null == crosstown) {
                 throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId()));
             }
@@ -281,8 +294,15 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             }
 
             OrderAccountDetail oad = new OrderAccountDetail();
+            InProgressVO inProgressVO = orderCalculateBiz.inProgressCalculate(orderMQDTO, orderItem, orderMQDTO.getOrderRentVehicleDetail().getFreeDays()
+                    , orderMQDTO.getOrderRentVehicleDetail().getUsedDay(), oad);
 
             //还车扣除款 剩余的 钱，再减去违章预备金
+            oad.getDeductions().add(new OrderAccountDeduction(){{
+                setOrigin(OrderAccountDeduction.ORIGIN_DEPOSIT);
+                setAmount(illegalReserve);
+                setType(DeductionTypeEnum.KEEP_VIOLATE_TRAFFIC.getCode());
+            }});
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
             BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
             String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();

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

@@ -306,6 +306,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             DateTime nowTime = DateTime.parse(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
             DateTime endTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getEndTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
             DateTime startTime = DateTime.parse(new DateTime(orderRentVehicleDetail.getStartTime()).toString(DEFAULT_DATE_TIME_FORMATTER), DEFAULT_DATE_TIME_FORMATTER);
+
+            //设置使用天数
+            int userUsedDay = getDaysBetweenDateTime(startTime, nowTime);
+            orderRentVehicleDetail.setUsedDay(userUsedDay);
+            orderRentVehicleBiz.updateSelectiveById(orderRentVehicleDetail);
+
             //实际预定的天数
             int actualDay = getDaysBetweenDateTime(startTime, endTime);
             if (orderRentVehicleDetail.getEndTime() > nowTime.getMillis()) {
@@ -315,13 +321,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 BigDecimal cost = new BigDecimal(0);
                 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());
-                    }
+//                    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());
+//                    }
                     cost.add(inProgressVO.getExtraAmount()).add(inProgressVO.getViolateAmount());
                 }
 

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

 package com.xxfc.platform.order.biz.inner;
 
-import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
-import com.xxfc.platform.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
 import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderItemBiz;
@@ -17,27 +12,15 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
-import com.xxfc.platform.universal.constant.DictionaryKey;
-import com.xxfc.platform.universal.dto.SmsTemplateDTO;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
  * 订单退款记录表
@@ -143,9 +126,23 @@ public class OrderCalculateBiz {
                 residueDays = 2;
             }
             inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal((residueDays + ""))));
-            OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            oad.getDeductions().add(violateDeduction);
+        }else if(residueDays < 0){
+            //如果订单 出发中 或者 已完成 或者定损中
+            if(OrderStatusEnum.ORDER_WAIT.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FINISH.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FIXED_LOSS.equals(baseOrder.getStatus())) {
+                Integer overDays = 0 - residueDays;
+                if(overDays > 2) {
+                    overDays = 2;
+                }
+                //超过的天数 * 200% * 单价
+                inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal(2+ "")).multiply(new BigDecimal((overDays + ""))));
+                OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT);
                 oad.getDeductions().add(violateDeduction);
             }
+        }
 
         return inProgressVO;
     }

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -139,8 +140,10 @@ public class OrderCancelBiz {
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
                     if(timeLag < 0 ) {
+                        //开始时间当天时间戳
+                        Long beginOfStartDay = DateUtil.beginOfDay(DateUtil.date(orvd.getStartTime())).getTime();
                         //计算：使用天数 当前时间 - 开始时间的0时0分0秒
-                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
+                        Long useTimeLag = System.currentTimeMillis() - beginOfStartDay;
                         Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
                         inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays, oad);
                         oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount()).subtract(inProgressVO.getViolateAmount()));

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.mqhandler;
 
 import cn.hutool.json.JSONUtil;
 import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,9 @@ public class RefundMQHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     /**
      * 退款
      * @param
@@ -42,7 +46,7 @@ public class RefundMQHandler {
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
 
-//                    orderRefundBiz.refundPartDeposit(orderMQDTO);
+                    orderAccountBiz.refundPartDeposit(orderMQDTO);
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);