Merge branch 'holiday-price' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -426,6 +426,12 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
 
             //剩余押金 = 押金 - 违章保证金 - 定损金额
             oad.setDepositAmount(oad.getDepositAmount().subtract(illegalReserve).subtract(csv.getDamagesAmount()));
+
+            //设置违约金
+                //设置原来算出的违约金及描述
+            csv.setViolateAmount(inProgressVO.getViolateAmount());
+            csv.setViolateDesc(inProgressVO.getViolateDesc());
+                //处理更改之后的违约金及描述
             handleCrosstownDetail(crosstown, oad, csv);
 
             //退款

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);
             }
-        }
 
     }