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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -74,6 +74,6 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
 
     public void initDate() {
         this.startDate = DateUtil.date(getStartTime());
-        this.endDate = DateUtil.date(getEndDate());
+        this.endDate = DateUtil.date(getEndTime());
     }
 }

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

@@ -89,19 +89,15 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
     /**
      * @param multiple   倍数
      * @param freeDays   免费天数
-     * @param configDate 设置的日期*月份
      */
-    public void updateVehicleModelHolidayPrice(Double multiple, Integer freeDays, Date configDate) {
+    public void updateVehicleModelHolidayPrice(Double multiple, Integer freeDays) {
         VehicleModelHolidayPrice vehicleModelHolidayPrice = new VehicleModelHolidayPrice();
         vehicleModelHolidayPrice.setMultiple(multiple);
         vehicleModelHolidayPrice.setFreeDays(freeDays);
         Example example = new Example(VehicleModelHolidayPrice.class);
         Example.Criteria criteria = example.createCriteria();
-        setCondtionDate(configDate, null, criteria);
-        int effect = mapper.updateByExampleSelective(vehicleModelHolidayPrice, example);
-        if (effect < 1) {
-            throw new BaseException("车型节假日更新失败");
-        }
+        criteria.andEqualTo("isDel",0);
+        mapper.updateByExampleSelective(vehicleModelHolidayPrice,example);
     }
 
     /**

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleModelHolidayPriceMapper.java

@@ -11,4 +11,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @data 2019/10/14 17:32
  */
 public interface VehicleModelHolidayPriceMapper extends Mapper<VehicleModelHolidayPrice>, InsertListMapper<VehicleModelHolidayPrice> {
+
 }

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

@@ -35,21 +35,27 @@ public class VehicleModelHolidayPriceAdminController {
     }
 
     @GetMapping("/{id}")
-    public ObjectRestResponse<VehicleModelHolidayPriceSaveDTO> findVehicleModelHolidayPrice(@PathVariable(value = "id") Long id){
-        VehicleModelHolidayPriceSaveDTO  vehicleModelHolidayPriceSaveDTO = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceFestivalId(id);
+    public ObjectRestResponse<VehicleModelHolidayPriceSaveDTO> findVehicleModelHolidayPrice(@PathVariable(value = "id") Long id) {
+        VehicleModelHolidayPriceSaveDTO vehicleModelHolidayPriceSaveDTO = vehicleModelHolidayPriceBiz.findVehicleModelHolidayPriceFestivalId(id);
         return ObjectRestResponse.succ(vehicleModelHolidayPriceSaveDTO);
     }
 
     @ApiOperation("节假日页查询")
     @PostMapping("/page")
-    public ObjectRestResponse<List<VehicleModelHolidayPriceVo>> listVehicleModelHolidayPrice(@RequestBody VehicleModelHolidayPriceFindDTO vehicleModelHolidayPriceFindDTO){
+    public ObjectRestResponse<List<VehicleModelHolidayPriceVo>> listVehicleModelHolidayPrice(@RequestBody VehicleModelHolidayPriceFindDTO vehicleModelHolidayPriceFindDTO) {
         List<VehicleModelHolidayPriceVo> priceVoPageDataVO = vehicleModelHolidayPriceBiz.listVehicleModelHolidayPrice(vehicleModelHolidayPriceFindDTO);
         return ObjectRestResponse.succ(priceVoPageDataVO);
     }
 
     @DeleteMapping("/{id}")
-    public ObjectRestResponse<Void> delete(@PathVariable(value = "id") Integer id){
+    public ObjectRestResponse<Void> delete(@PathVariable(value = "id") Integer id) {
         vehicleModelHolidayPriceBiz.deleteById(id);
-        return  ObjectRestResponse.succ();
+        return ObjectRestResponse.succ();
+    }
+
+    @PutMapping("/update")
+    public ObjectRestResponse<Void> update(@RequestParam(value = "multiple",required = false) Double multiple, @RequestParam(value = "freeDays",required = false) Integer freeDays) {
+        vehicleModelHolidayPriceBiz.updateVehicleModelHolidayPrice(multiple, freeDays);
+        return ObjectRestResponse.succ();
     }
 }