Commit 22a4a620 authored by 周健威's avatar 周健威

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

parents 1b30e2a9 c2cdd8e0
...@@ -71,7 +71,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr ...@@ -71,7 +71,7 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
* @param userId * @param userId
*/ */
public void addVehicleModelCalendarPrice(List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPrices, String date,Integer 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<VehicleModelCalendarPrice> vehicleModelCalendarPriceList = new ArrayList<>();
List<Date> dateList = vehicleModelCalendarPrices.stream().peek(x -> { List<Date> dateList = vehicleModelCalendarPrices.stream().peek(x -> {
VehicleModelCalendarPrice calendarPrice = new VehicleModelCalendarPrice(); VehicleModelCalendarPrice calendarPrice = new VehicleModelCalendarPrice();
...@@ -101,10 +101,9 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr ...@@ -101,10 +101,9 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
mapper.updateByExampleSelective(vehicleModelCalendarPrice, example); mapper.updateByExampleSelective(vehicleModelCalendarPrice, example);
//2.插入新的数据 //2.插入新的数据
if (!CollectionUtils.isNotEmpty(dateList)){ if (CollectionUtils.isNotEmpty(dateList)) {
mapper.insertList(vehicleModelCalendarPriceList); mapper.insertList(vehicleModelCalendarPriceList);
} }
}
} }
......
...@@ -30,8 +30,9 @@ public class VehicleModelCalendarPriceAdminController { ...@@ -30,8 +30,9 @@ public class VehicleModelCalendarPriceAdminController {
private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz; private final VehicleModelCalendarPriceBiz vehicleModelCalendarPriceBiz;
@ApiOperation("车型日历价格设置") @ApiOperation("车型日历价格设置")
@PostMapping("/add_edit") @PostMapping(value = {"/add_edit/{date}","/add_edit"})
public ObjectRestResponse<Void> add(@RequestBody List<VehicleModelCalendarPriceSaveDTO> vehicleModelCalendarPriceSaveDTO, @RequestParam("date") String date ,UserDTO userDTO){ 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()); vehicleModelCalendarPriceBiz.addVehicleModelCalendarPrice(vehicleModelCalendarPriceSaveDTO,date,userDTO.getId());
return ObjectRestResponse.succ(); return ObjectRestResponse.succ();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment