Merge branch 'holiday-price' into dev

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

 package com.xxfc.platform.order.pojo.price;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO;
 import lombok.Data;
@@ -41,7 +42,7 @@ public class CostDetailExtend {
     /**
      * 使用（消耗）详情列表
      */
-    List<VMCalendarPriceCostDTO> useAmountList;
+    List<VMCalendarPriceCostDTO> useAmountList = CollUtil.newArrayList();;
 
     public void initParamJson() {
         paramJson = JSONUtil.toJsonStr(this);

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

@@ -301,9 +301,10 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
                 if(inProgressVO.getExtraAmount() != null) {
                     dedDetailDTO.setExcessCost(inProgressVO.getExtraAmount());
                 }
-                stringBuilder.append("违约金( ¥");
-                stringBuilder.append(amount);
-                stringBuilder.append(" x ");
+//                stringBuilder.append("违约金( ¥");
+                stringBuilder.append("违约金( ");
+//                stringBuilder.append(amount);
+//                stringBuilder.append(" x ");
                 stringBuilder.append(noUsedDay);
                 stringBuilder.append("天) = ");
                 stringBuilder.append(inProgressVO.getViolateAmount());
@@ -314,12 +315,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
              */
         } else if (userUsedDay - actualDay > 0) {
             StringBuilder stringBuilder = new StringBuilder();
-            stringBuilder.append("违约金( ¥");
+//            stringBuilder.append("违约金( ¥");
+            stringBuilder.append("违约金( ");
             //延期的天数, 延期违约金是延期天数*200%
             int extraUsedDay = userUsedDay - actualDay;
             if(extraUsedDay > 0) {
-                stringBuilder.append(amount);
-                stringBuilder.append(" x ");
+//                stringBuilder.append(amount);
+//                stringBuilder.append(" x ");
                 stringBuilder.append(extraUsedDay);
                 stringBuilder.append("(天)");
                 stringBuilder.append(" x 2)");

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

@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             csv.setHadConpon((StrUtil.isNotBlank(orderMQDTO.getCouponTickerNos())? Boolean.TRUE: Boolean.FALSE));
             csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
             csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
+            csv.setUseAmountList(inProgressVO.getUseAmountList());
+            csv.setOverAmountList(inProgressVO.getOverAmountList());
 
             if(csv.getUsedDayNum() == orderMQDTO.getOrderRentVehicleDetail().getDayNum()) {
                 csv.setType(CostDetailExtend.FINLISH_ONTIME);

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

@@ -177,6 +177,8 @@ public class OrderCancelBiz {
                         csv.setViolateDesc("");
                         csv.setSameUseUnitPriceFromList(inProgressVO.getUseAmountList());
                         csv.setSameOverUnitPriceFromList(inProgressVO.getOverAmountList());
+                        csv.setUseAmountList(inProgressVO.getUseAmountList());
+                        csv.setOverAmountList(inProgressVO.getOverAmountList());
 
                         //如果有扣款项，则生成额外的费用明细
                         if(oad.getDeductions().size() > 0) {