添加驳回预定申请理由

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -526,7 +526,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
      * @return
      */
     @Transactional
-    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName) throws Exception{
+    public RestResponse<Integer> reviewVehicleBooking(Integer operatorId, Long bookRecordId,Integer rsStatus,String userName, String rejectRemark) throws Exception{
         try {
         //获取相关申请记录
         VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
@@ -550,6 +550,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             updateParam.put("reviewerApply",operatorId);
             updateParam.put("reviewerNameApply",userName);
             updateParam.put("statusCondition",VehicleBookRecordStatus.APPLY.getCode());
+            if(StringUtils.isNotBlank(rejectRemark)) {
+                updateParam.put("rejectRemark",rejectRemark);
+            }
             Integer effected = vehicleBookRecordBiz.changeRecordStatus(updateParam);
             if(effected == 0){//修改失败，手动回滚
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();//手动回滚

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -70,7 +70,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = USER_APP_NAME;
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, "租车订单取消");
     }
 
     /**
@@ -102,7 +102,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = USER_APP_NAME;
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName, "");
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -240,7 +240,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.APPROVE.getCode(), userName, "");
     }
 
     /**
@@ -249,12 +249,12 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
      * @param bookRecordId
      * @return
      */
-    @RequestMapping(value = "/book/4employee/reject/{bookRecordId}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/book/4employee/reject", method = RequestMethod.PUT)
     @ApiOperation(value = "拒绝预定车辆")
-    public RestResponse<Integer> rejectVehicleBooking(@PathVariable Long bookRecordId) throws Exception {
+    public RestResponse<Integer> rejectVehicleBooking(Long bookRecordId, String rejectRemark) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName);
+        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, rejectRemark);
     }
 
 //    /**
@@ -277,9 +277,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
      * @param bookRecordId
      * @return
      */
-    @RequestMapping(value = "/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/unbook/4employee", method = RequestMethod.DELETE)
     @ApiOperation(value = "取消预定车辆")
-    public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId,  String rejectRemark) throws Exception {
+    public RestResponse<Integer> unbookVehicle(Long bookRecordId,  String rejectRemark) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName, rejectRemark);