Merge remote-tracking branch 'origin/dev' into dev

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -19,13 +19,14 @@ public class MQSenderController {
     }
 
     @PostMapping(value = "/app/unauth/sendMessage")
-    public ObjectRestResponse sendPostMessage(@RequestParam("json") String json) {
+    public ObjectRestResponse sendPostMessage(@RequestBody String json) {
         return mqServiceBiZ.sendMessage("","", json);
     }
 
     @PostMapping(value = "/sendMessage")
     @ResponseBody
     public ObjectRestResponse sendMessage(@RequestBody SendMsgDTO dto) {
+        String string = "{\"integralRuleCode\":\"SHARE\", \"userId\":75}";
         return mqServiceBiZ.sendMessage(dto.getExchange(), dto.getRoutKey(), dto.getJson());
     }
 

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

@@ -246,15 +246,15 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     /**
      * 拒绝预定车辆申请
      *
-     * @param bookRecordId
+     * @param
      * @return
      */
     @RequestMapping(value = "/book/4employee/reject", method = RequestMethod.PUT)
     @ApiOperation(value = "拒绝预定车辆")
-    public RestResponse<Integer> rejectVehicleBooking(Long bookRecordId, String rejectRemark) throws Exception {
+    public RestResponse<Integer> rejectVehicleBooking(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.reviewVehicleBooking(operatorId, bookRecordId, VehicleBookRecordStatus.REJECTED.getCode(), userName, rejectRemark);
+        return baseBiz.reviewVehicleBooking(operatorId, bookVehicleVo.getVehicleBookRecordId(), VehicleBookRecordStatus.REJECTED.getCode(), userName, bookVehicleVo.getRejectRemark());
     }
 
 //    /**
@@ -274,15 +274,15 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     /**
      * 取消车辆预订
      *
-     * @param bookRecordId
+     * @param
      * @return
      */
     @RequestMapping(value = "/unbook/4employee", method = RequestMethod.DELETE)
     @ApiOperation(value = "取消预定车辆")
-    public RestResponse<Integer> unbookVehicle(Long bookRecordId,  String rejectRemark) throws Exception {
+    public RestResponse<Integer> unbookVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.unbookVehicle4Employee(operatorId, bookRecordId, userName, rejectRemark, Boolean.FALSE);
+        return baseBiz.unbookVehicle4Employee(operatorId, bookVehicleVo.getVehicleBookRecordId(), userName, bookVehicleVo.getRejectRemark(), Boolean.FALSE);
     }
 
     @RequestMapping(value = "/bookedRecord/{bookEndDate}/{id}", method = RequestMethod.GET)