修改部分代码

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

@@ -4,6 +4,7 @@ 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.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
@@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
@@ -67,6 +69,9 @@ public class OrderCancelBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    ActivityFeign activityFeign;
+
     private static Map<Integer, List<Integer>> cancelAble;
     static {
         cancelAble = new HashMap<Integer, List<Integer>>();
@@ -110,28 +115,64 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
+                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+                        setOrderId(baseOrder.getId());
+                    }});
+
                     //原退还押金
+                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
                     BigDecimal freeDayAmount = BigDecimal.ZERO;
-                    //判断是否使用免费天数，并且进行扣款
-                    if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
-                        OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
-                            setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                            setOrderId(baseOrder.getId());
-                        }});
-                        freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-                    }
 
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                    //后面允许开始时间过后可以取消订单
-//                    if(timeLag < 0) {
+                    if(timeLag < 0 ) {
 //                        throw new BaseException(ResultCode.FAILED_CODE, new HashSet<String>(){{
 //                            add("已超过出发时间，不能取消订单");
 //                        }});
-//                    }
+                        //计算：使用天数 当前时间 - 开始时间的0时0分0秒
+                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
+                        Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
+
+                        //计算：剩余免费天数
+                        Integer backFreeDays = freeDays - useDays;
+                        //过了出发时间取消订单 ，优先使用免费天数
+                        if(backFreeDays <= 0) {
+                            //大于总天数 只返回押金
+                            if(useDays >= orderItem.getTotalNum()) {
+                                //退押金
+                                orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+                            }else {
+                                //需要扣除订单费用
+                                //判断是否达到优惠券条件 不符合则返还优惠券
+                                Integer consumeDays = 0 - backFreeDays;
+                                    //计算使用天数的费用
+                                BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
+                                //activityFeign.use(dto.getUserid(), detail.getTickerNo(), detail.getOrder().getNo(), channel, vehicleAmount, ActivityFeign.TYPE_NO_USE);
+                                //for()
+
+                            }
+                        }else {
+
+                        }
+
+                    }else {
+                        //判断是否使用免费天数，并且进行扣款
+                        if(freeDays > 0) {
+                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+
+                            //违约金封顶 租车身份价 * 2天
+                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal("2"));
+                            if(freeDayAmount.compareTo(topAmount) > 0) {
+                                freeDayAmount = freeDayAmount;
+                            }
+                        }
+                    }
+
+
 
                     //退款流程
                         //退订单款