添加延期代码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/calculate/InProgressVO.java

@@ -98,20 +98,9 @@ public class InProgressVO {
      */
     List<VMCalendarPriceCostDTO> violateAmountList = CollUtil.newArrayList();
 
-    /**
-     * 延期增加的天数
-     */
-    Integer delayAddDays = 0;
-
-    /**
-     * 不计免赔单价
-     */
-    BigDecimal damageSafePrice = BigDecimal.ZERO;
 
     /**
-     * 延期不记免赔费用
+     * 添加的延期费用
      */
-    BigDecimal delayDamageSafeAmount = BigDecimal.ZERO;
-
     DelayAddPriceVO delayAddPriceVO = new DelayAddPriceVO();
 }

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

@@ -349,14 +349,14 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         JSONArray jsonArray = new JSONArray();
         if (inProgressVO != null) {
                 //新增延长还车，不计免赔额,金额大于0才显示
-           if (inProgressVO.getDelayDamageSafeAmount() != null && inProgressVO.getDelayDamageSafeAmount().doubleValue() > 0) {
+           if (inProgressVO.getDelayAddPriceVO().getDelayDamageSafeAmount() != null && inProgressVO.getDelayAddPriceVO().getDelayDamageSafeAmount().doubleValue() > 0) {
               StringBuilder stringBuilder = new StringBuilder();
               stringBuilder.append("延长用车");
-              stringBuilder.append(inProgressVO.getDelayAddDays());
+              stringBuilder.append(inProgressVO.getDelayAddPriceVO().getDelayAddDays());
               stringBuilder.append("天,  补扣不计免赔费用");
-              stringBuilder.append(inProgressVO.getDelayDamageSafeAmount());
+              stringBuilder.append(inProgressVO.getDelayAddPriceVO().getDelayDamageSafeAmount());
               stringBuilder.append("元");
-              initDedDetail(dedDetailDTO, OrderViolateEnum.DELAY_VEHICLE.getCode(), inProgressVO.getDelayDamageSafeAmount(), stringBuilder);
+              initDedDetail(dedDetailDTO, OrderViolateEnum.DELAY_VEHICLE.getCode(), inProgressVO.getDelayAddPriceVO().getDelayDamageSafeAmount(), stringBuilder);
               jsonArray.add(dedDetailDTO);
               orderPageVO.setDelayVehicleDetail(jsonArray.toJSONString());
               jsonArray.clear();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -62,7 +62,7 @@ import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_T
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.YMR_SLASH_FORMATTER;
 
 @Controller
-@RequestMapping("baseOrder")
+//@RequestMapping("baseOrder")
 @Api(value = "订单后台相关", tags = {"订单后台相关"})
 @Slf4j
 public class BackStageOrderController extends CommonBaseController implements UserRestInterface {
@@ -102,7 +102,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return userFeign;
     }
 
-    @RequestMapping(value = "/getOrderList", method = RequestMethod.GET)
+    @RequestMapping(value = "/baseOrder/getOrderList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "获取后台订单列表")
     @IgnoreClientToken
@@ -278,7 +278,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
-    @RequestMapping(value = "/getVehicleList", method = RequestMethod.GET)
+    @RequestMapping(value = "/baseOrder/getVehicleList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "交还车租车订单列表")
     @IgnoreClientToken
@@ -341,7 +341,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
-    @RequestMapping(value = "/getTourList", method = RequestMethod.GET)
+    @RequestMapping(value = "/baseOrder/getTourList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "交还车旅游订单列表")
     @IgnoreClientToken
@@ -356,7 +356,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 
-    @GetMapping(value = "/orderDetail")
+    @GetMapping(value = "/baseOrder/orderDetail")
     @ApiOperation(value = "交还车获取订单详情，带驾驶人信息")
     @IgnoreClientToken
     @ResponseBody
@@ -377,7 +377,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
 
 
     @ApiOperation("结合后台人员所属公司查询订单详情")
-    @RequestMapping(value = "/company/{no}", method = RequestMethod.GET)
+    @RequestMapping(value = "/baseOrder/company/{no}", method = RequestMethod.GET)
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> companyGet(@PathVariable String no) {
@@ -395,7 +395,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
     }
 
     @ApiOperation("更換車輛")
-    @RequestMapping(value = "/bg/change-vehicle", method = RequestMethod.POST)
+    @RequestMapping(value = "/baseOrder/bg/change-vehicle", method = RequestMethod.POST)
     @IgnoreClientToken
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> changeVehicle(@RequestBody ChangeVehicleDTO dto) {
@@ -438,13 +438,25 @@ public class BackStageOrderController extends CommonBaseController implements Us
         return ObjectRestResponse.succ();
     }
 
-    @PostMapping("/updateEndCompany")
+    @ApiOperation("修改租车订单延期")
+    @RequestMapping(value = "/baseOrder/bg/delay-rent-order", method = RequestMethod.POST)
+    @IgnoreClientToken
+    @ResponseBody
+    public ObjectRestResponse<OrderPageVO> delayRentOrder(@RequestBody delayRentOrderDTO dto) {
+        checkAdminUser();
+        //根据订单号获取订单
+
+
+        return ObjectRestResponse.succ();
+    }
+
+    @PostMapping("/baseOrder/updateEndCompany")
     @ResponseBody
     public ObjectRestResponse updateEndCompany(@RequestBody OrderRentVehicleDetail orderRentVehicleDetail) {
         return baseOrderBiz.save(orderRentVehicleDetail);
     }
 
-    @GetMapping(value = "/getAll")
+    @GetMapping(value = "/baseOrder/getAll")
     @ResponseBody
     public ObjectRestResponse getAllOrderList(BaseOrderController.QueryOrderList dto) {
         return backgroundBaseOrderBiz.getAllOrderList(dto);
@@ -456,6 +468,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
         String numberPlate;
     }
 
+    @Data
+    public static class delayRentOrderDTO {
+        Integer no;
+        Long delayEndTime;
+    }
+
     private Query initCompanyQuery(String no) {
         BackStageOrderController.QueryOrderDetailDTO qodd = new BackStageOrderController.QueryOrderDetailDTO();
         //查询公司id