Merge remote-tracking branch 'origin/holiday-price' into holiday-price

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

@@ -71,7 +71,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
      * @param userId
      */
     public void addVehicleModelCalendarPrice(List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPrices, String date,Integer userId) {
-        if (CollectionUtils.isNotEmpty(vehicleModelCalendarPrices)) {
+            vehicleModelCalendarPrices = vehicleModelCalendarPrices==null?Collections.EMPTY_LIST:vehicleModelCalendarPrices;
             List<VehicleModelCalendarPrice> vehicleModelCalendarPriceList = new ArrayList<>();
             List<Date> dateList = vehicleModelCalendarPrices.stream().peek(x -> {
                 VehicleModelCalendarPrice calendarPrice = new VehicleModelCalendarPrice();
@@ -101,10 +101,9 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
             mapper.updateByExampleSelective(vehicleModelCalendarPrice, example);
 
             //2.插入新的数据
-            if (!CollectionUtils.isNotEmpty(dateList)){
+            if (CollectionUtils.isNotEmpty(dateList)) {
                 mapper.insertList(vehicleModelCalendarPriceList);
             }
-        }
 
     }
 

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

@@ -30,8 +30,9 @@ public class VehicleModelCalendarPriceAdminController {
     private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
 
     @ApiOperation("车型日历价格设置")
-    @PostMapping("/add_edit")
-    public ObjectRestResponse<Void> add(@RequestBody List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, @RequestParam("date") String date ,UserDTO userDTO){
+    @PostMapping(value = {"/add_edit/{date}","/add_edit"})
+    public ObjectRestResponse<Void> add(@RequestBody(required = false) List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO,
+                                        @PathVariable(name = "date",required = false) String date ,UserDTO userDTO){
         vehicleModelCalendarPriceBiz.addVehicleModelCalendarPrice(vehicleModelCalendarPriceSaveDTO,date,userDTO.getId());
         return ObjectRestResponse.succ();
     }