Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderItem.java

@@ -146,6 +146,14 @@ public class OrderItem implements Serializable {
 		return calculateAmount;
 	}
 
+	public BigDecimal getBuyAmount() {
+		return getUnitPrice().multiply(new BigDecimal(getBuyNum() + ""));
+	}
+
+	public BigDecimal getCutAmount() {
+		return getUnitPrice().multiply(new BigDecimal(getCutNum() + ""));
+	}
+
 	public BigDecimal handleCouponAmount(BigDecimal couponAmount) {
 		BigDecimal realAmountResidue = getRealAmount().subtract(couponAmount);
 		//剩余价格小于0  即优惠价格超出本item的实际价格，返回剩余优惠

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

@@ -33,4 +33,29 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafePrice;
     @ApiModelProperty(value = "费用详情")
     private String costDetail;
+
+//    /**
+//     * 原租车天数
+//     */
+//    private Integer originDayNum;
+
+    /**
+     * 免费天数
+     */
+    private Integer freeDayNum;
+
+    /**
+     * 免费价格
+     */
+    private BigDecimal freeAmount;
+
+    /**
+     * 购买的租车金额
+     */
+    private BigDecimal buyVehicleAmount;
+
+    /**
+     * 优惠描述
+     */
+    private String couponDesc = "";
 }

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

@@ -5,6 +5,7 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Maps;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.mapper.OrderTemplateMapper;
 import org.springframework.stereotype.Service;
@@ -57,4 +58,17 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
         return template.render(map);
     }
 
+    public static void main(String[] args) {
+        String tempStr = "{\"key\":\"费用明细\", \"val\":\"\", \"consumeAmount\":\"${consumeAmount}\",\"children\":[${children}]}";
+        Map map = Maps.newHashMap();
+        map.put("consumeAmount", "");
+        map.put("children", "{\"test\" : \"1111\" }");
+
+        //匹配参数 填充参数
+        TemplateEngine engine = TemplateUtil.createEngine();
+        Template template = engine.getTemplate(tempStr);
+        String result = template.render(new Dict(map));
+        System.out.println(result);
+    }
+
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -219,6 +219,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         BigDecimal damageSafeAmount = BigDecimal.ZERO;
 //        BigDecimal modelAmount = BigDecimal.ZERO;
         BigDecimal couponAmount = BigDecimal.ZERO;
+        String couponDesc = "";
         Integer vehicleDayNum = 0;
         Integer freeDayNum = 0;
 
@@ -314,6 +315,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
                 detail.getOrder().setCouponTickerNos(detail.getTickerNo().stream().collect(Collectors.joining(",")));
                 detail.getOrder().setHasDiscount(SYS_TRUE);
                 vehicleOrderItem.handleCouponAmount(couponAmount);
+                couponDesc += activityFeign.info(detail.getTickerNo().get(0)).getTitle();
             }
         }
 
@@ -340,6 +342,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setModelAmount(vehicleOrderItem.getUnitPrice());
         rvp.setVehicleDayNum(vehicleDayNum);
 
+        rvp.setFreeDayNum(freeDayNum);
+        rvp.setFreeAmount(vehicleOrderItem.getCutAmount());
+        rvp.setBuyVehicleAmount(vehicleOrderItem.getBuyAmount());
+        rvp.setCouponDesc(couponDesc);
+
         //设置收费明细
         costDetail(rvp, handleChildren(detail, vehicleDayNum));
         return rvp;
@@ -389,6 +396,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         if(DRIVER_TYPE_DAMAGE_SAFE.equals(detail.getDamageSafe())) {
             childrenStr.append(",${tem_0104}");
         }
+        if(detail.getFreeDays() > 0) {
+            childrenStr.append(",${tem_0105}");
+        }
         if(StrUtil.isNotBlank(detail.getOrder().getCouponTickerNos())) {
             childrenStr.append(",${tem_9901}");
         }
@@ -433,4 +443,5 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         detail.setVehicleId(orr.getData().getVehicleId());
         detail.setBookRecordId(orr.getData().getId());
     }
+
 }