修改代码

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

@@ -144,15 +144,6 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-//                    List<OrderItem> otherOrderItems = orderItemBiz.selectByExample(new Example.Builder(OrderItem.class)
-//                        .where(WeekendSqls.<OrderItem>custom().andNotEqualTo(OrderItem::getType, ItemTypeEnum.VEHICLE_MODEL.getCode())).build()
-//                    );
-
-                    //原退还押金
-                    Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-//                    BigDecimal freeDayAmount = BigDecimal.ZERO;
-
-
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount
                     //获取出发时间 到现在 距离时间
@@ -205,9 +196,6 @@ public class OrderCancelBiz {
                     }else {
 //                        //没到出车时间
 //                        //判断是否使用免费天数，并且进行扣款
-//                        if(freeDays > 0) {
-//                            freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-//                        }
 
                         //违约金封顶 租车身份价 * 2天
                         BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -217,7 +217,6 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal vehicleAmount = BigDecimal.ZERO;
         BigDecimal driverAmount = BigDecimal.ZERO;
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
-//        BigDecimal modelAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
         String couponDesc = "";
         Integer vehicleDayNum = 0;