申请调车相关

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

@@ -70,8 +70,8 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
-            RentVehicleBO bo = initRentVehicleBO(vo);
-            vo.setDayNum(orderCalculateBiz.getIncludeDays(vo.getStartTime(), vo.getEndTime()));
+            RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(vo);
+//            vo.setDayNum(orderCalculateBiz.getIncludeDays(vo.getStartTime(), vo.getEndTime()));
             bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             orderRentVehicleService.createOrder(bo);
             return ObjectRestResponse.succ(bo.getOrder());
@@ -83,8 +83,7 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ApiOperation(value = "后台人员为客户下租车订单")
         public ObjectRestResponse<BaseOrder> backStagedd(@RequestBody BgAddRentDTO dto){
                 RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(dto);
-                bo.setDayNum(orderCalculateBiz.getIncludeDays(dto.getStartTime(), dto.getEndTime()));
-
+//                bo.setDayNum(orderCalculateBiz.getIncludeDays(dto.getStartTime(), dto.getEndTime()));
                 bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
                 bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
                 //设置-1表示查询所有的车
@@ -93,51 +92,6 @@ public class OrderRentVehicleController extends CommonBaseController {
                 return ObjectRestResponse.succ(bo.getOrder());
         }
 
-        private RentVehicleBO initRentVehicleBO(@RequestBody AddRentVehicleDTO vo) {
-                //计算天数
-                vo.setDayNum(orderCalculateBiz.getIncludeDays(vo.getStartTime(), vo.getEndTime()));
-
-                if(null == vo.getEndCompanyId() || vo.getEndCompanyId().equals(0)) {
-                    if(StrUtil.isBlank(vo.getEndAddr())) {
-                            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
-                    }else {
-                            Map<String, Object> map = BeanUtil.beanToMap(new BranchCompany(){{
-                                    setName(vo.getEndAddr());
-                            }}, false, true);
-                            List<BranchCompany> data = vehicleFeign.branchCompanyEntityList(map).getData();
-                            if(null == data) {
-                                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
-                            }else {
-                                    BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
-                                    vo.setEndCompanyId(endCompany.getId());
-                            }
-                    }
-                }
-                if(vo.getStartCompanyId() != null) {
-                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
-                        if(companyDetail != null) {
-                                vo.setStartAddr(companyDetail.detailAddr());
-                        }
-                }
-                if(vo.getEndCompanyId() != null) {
-                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getEndCompanyId()).getData();
-                        if(companyDetail != null) {
-                                vo.setEndAddr(companyDetail.detailAddr());
-                        }
-                }
-                RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
-                bo.setBookVehicleVO(new BookVehicleVO(){{
-                        setBookStartDate(vo.getBookStartDate());
-                        setBookEndDate(vo.getBookEndDate());
-                        setBookStartDateTime(vo.getBookStartDateTime());
-                        setBookEndDateTime(vo.getBookEndDateTime());
-                }});
-                bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
-                        StrUtil.splitTrim(vo.getTickerNos(), ","):null);
-                bo.setAccompanyItems(vo.getAccompanyItems());
-                return bo;
-        }
-
         @RequestMapping(value = "list-by-order/{orderId}",method = RequestMethod.GET)
         @ResponseBody
         @ApiOperation(value = "租车列表by订单Id")

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

@@ -24,6 +24,9 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import static com.xxfc.platform.order.entity.ShuntApply.STATUS_CONFIRM;
+import static com.xxfc.platform.order.entity.ShuntApply.STATUS_CRT;
+
 @RestController
 @RequestMapping("/background/shuntApply")
 public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApply> {
@@ -41,9 +44,6 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
     @Autowired
     OrderCalculateBiz orderCalculateBiz;
 
-    @Autowired
-    ShuntApplyBiz shuntApplyBiz;
-
     @Autowired
     OrderRentVehicleService orderRentVehicleService;
 
@@ -61,30 +61,21 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
         }
 
-        ShuntApply shuntApply = shuntApplyBiz.selectById(dto.getApplyId());
-        if(null == shuntApply) {
+        ShuntApply shuntApply = baseBiz.selectById(dto.getApplyId());
+        if(null == shuntApply && shuntApply.getStatus() != STATUS_CRT) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
         }
 
-        BgAddRentDTO bgAddRentDTO = new BgAddRentDTO();
-        bgAddRentDTO.setAppUserId(shuntApply.getUserId());
-        bgAddRentDTO.setStartTime(shuntApply.getStartTime());
-        bgAddRentDTO.setEndTime(shuntApply.getEndTime());
-
-        RentVehicleBO bo = orderRentVehicleBiz.initRentVehicleBO(bgAddRentDTO);
-        bo.setDayNum(orderCalculateBiz.getIncludeDays(bgAddRentDTO.getStartTime(), bgAddRentDTO.getEndTime()));
+        shuntApply.setVehicleId(dto.getVehicleId());
+        shuntApply.setStatus(STATUS_CONFIRM);
+        baseBiz.updateSelectiveById(shuntApply);
 
-        bo.setAppUserDTO(userFeign.userDetailById(bgAddRentDTO.getAppUserId()).getData());
-        bo.setCrtUser("-1"+ BaseContextHandler.getUserID());
-        //设置-1表示查询所有的车
-        //bo.setUseType(-1);
-        orderRentVehicleService.createOrder(bo);
-        return ObjectRestResponse.succ(bo.getOrder());
+        return ObjectRestResponse.succ();
     }
 
     @Data
     public static class confirmApplyDTO {
         Integer applyId;
-        Integer vehicleId;
+        String vehicleId;
     }
 }
\ No newline at end of file