修改车辆节假日价格信息

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

@@ -118,7 +118,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 
 	public VehicleHolidayPriceInfo getByVehicleId(String vehicleId, String date) {
 		Example example = new Example(VehicleHolidayPriceInfo.class);
-		example.createCriteria().andEqualTo("vehicleId", vehicleId).andEqualTo("festivalDate", date);
+		example.createCriteria().andEqualTo("vehicleId", vehicleId).andEqualTo("festivalDate", date).andEqualTo("isDel", 0);
 		return mapper.selectOneByExample(example);
 	}
 
@@ -140,7 +140,7 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 
 	public List<VehicleHolidayPriceInfo> getByVehicleIdAndDate (String vehicleId, String startDate, String endDate) {
 		Example example = new Example(VehicleHolidayPriceInfo.class);
-		example.createCriteria().andEqualTo("vehicleId", vehicleId).andBetween("festivalDate", startDate, endDate);
+		example.createCriteria().andEqualTo("vehicleId", vehicleId).andBetween("festivalDate", startDate, endDate).andEqualTo("isDel", 0);
 		return mapper.selectByExample(example);
 	}
 
@@ -229,10 +229,15 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 	//获取当前车辆所有的节日价格
 	public ObjectRestResponse<List<VehicleHolidayPriceInfo>> getByVehicleId (String vehicleId) {
 		Example example = new Example(VehicleHolidayPriceInfo.class);
-		example.createCriteria().andEqualTo("vehicleId", vehicleId);
+		example.createCriteria().andEqualTo("vehicleId", vehicleId).andEqualTo("isDel", 0);
 		return ObjectRestResponse.succ(mapper.selectByExample(example));
 	}
 
+	public List<VehicleHolidayPriceInfo> getByVehicleIdAndFestivalId (String vehicleId, Integer festivalId) {
+		Example example = new Example(VehicleHolidayPriceInfo.class);
+		example.createCriteria().andEqualTo("vehicleId", vehicleId).andEqualTo("festivalId", festivalId).andEqualTo("isDel", 0);
+		return mapper.selectByExample(example);
+	}
 
 	public ObjectRestResponse getAll(String vehicleId, Integer festivalId) {
 		List<VehicleHolidayPriceInfoVo> list = mapper.getAll(vehicleId, festivalId);
@@ -247,6 +252,18 @@ public class VehicleHolidayPriceInfoBiz extends BaseBiz<VehicleHolidayPriceInfoM
 	}
 
 
+	public ObjectRestResponse deleteByVehicleId(String vehicleId, Integer festivalId) {
+			List<VehicleHolidayPriceInfo> list = getByVehicleIdAndFestivalId(vehicleId, festivalId);
+			if (list != null && list.size() > 0) {
+				list.parallelStream().forEach(vehicleHolidayPriceInfo -> {
+					vehicleHolidayPriceInfo.setIsDel(1);
+					updateSelectiveByIdRe(vehicleHolidayPriceInfo);
+				});
+			}
+			return ObjectRestResponse.succ();
+	}
+
+
 
 	public static Set<String> getAllDate(String startDate, String endDate) {
 		Set<String> list = new HashSet<>();

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

@@ -47,6 +47,11 @@ public class VehicleHolidayPriceInfoController extends BaseController<VehicleHol
 		return ObjectRestResponse.succ(baseBiz.getSynthesizePrice(vehicleId, startDate, endDate, userId, companyId));
 	}
 
+	@DeleteMapping(value = "deleteByVehicleId")
+	public ObjectRestResponse deleteByVehicleId(String vehicleId, Integer festivalId) {
+		return baseBiz.deleteByVehicleId(vehicleId, festivalId);
+	}
+
 	@GetMapping(value = "multiCalendarPrice")
 	@IgnoreUserToken
 	public ObjectRestResponse<List<VehicleVO>> multiCalendarPrice(String vehicleIds, String startDate, String endDate, Integer companyId) {

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleHolidayPriceInfoMapper.xml

@@ -5,6 +5,7 @@
 
     <select id="getAll" resultType="com.xxfc.platform.vehicle.pojo.vo.VehicleHolidayPriceInfoVo">
         select festival_id, festival_day, MIN(festival_date) as startTime, MAX(festival_date) as endTime, rent_price, rent_free_day,vehicle_id from vehicle_holiday_price_info
+        where is_del = 0
         GROUP BY festival_id,festival_day,rent_price, rent_free_day,vehicle_id
         HAVING vehicle_id = #{vehicleId}
         <if test="festivalId != null">