Merge branch 'master-modify-cutAmount' into base-modify

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

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/DedDetailDTO.java

@@ -20,6 +20,11 @@ public class DedDetailDTO {
      */
     BigDecimal cost;
 
+    /**
+     * 订单超额费用
+     */
+    BigDecimal excessCost;
+
     /**
      * 编号（用于顺序）
      */

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

@@ -35,9 +35,7 @@ public class OrderPageVO extends BaseOrder {
     private String telephone;
 
     //订单违约金
-    private DedDetailDTO dedDetailDTO;
-    //订单消费超额金
-    private DedDetailDTO excessDedDetailDTO;
+    private String dedDetailDTO;
     /**
      * 車輛編碼
      */

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/BaseOrderBiz.java

@@ -14,14 +14,11 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Lists;
+import com.google.gson.JsonObject;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.biz.inner.OrderMsgBiz;
-import com.xxfc.platform.order.contant.enumerate.AccountTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderViolateEnum;
+import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
@@ -168,6 +165,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
 
         if (orderPageVo.getOrderRentVehicleDetail() != null) {
+
             if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
                 return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
             }
@@ -181,6 +179,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
 //                }
                 getDriverInfo(orderPageVo);
             } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+                //设置违约金金额
+                updateCrossRefund(orderPageVo);
                 getDriverInfo(orderPageVo);
                 getUserLicense(orderPageVo);
             }
@@ -198,8 +198,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 orderPageVo.setVehicalNumberPlat(response.getData().getNumberPlate());
                 orderPageVo.setCode(response.getData().getCode());
             }
-            //设置违约金金额
-            updateCrossRefund(orderPageVo);
+
         } else if (orderPageVo.getOrderTourDetail() != null) {
             if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
                 List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
@@ -254,6 +253,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 }
             }
         }
+        /**
+         * 提前还车
+         */
         if (orderPageVO.getOrderRentVehicleDetail().getEndTime() > nowTime.getMillis()) {
             StringBuilder stringBuilder = new StringBuilder();
             //提前的天数, 当天就算使用一天
@@ -266,9 +268,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             if (inProgressVO != null) {
                 //消费超额金
                 if(inProgressVO.getExtraAmount() != null) {
-                    DedDetailDTO excessDedDetailDTO = new DedDetailDTO();
-                    initDedDetail(excessDedDetailDTO, OrderViolateEnum.EXCESS.getCode(), inProgressVO.getExtraAmount(), stringBuilder);
-                    orderPageVO.setExcessDedDetailDTO(excessDedDetailDTO);
+                    dedDetailDTO.setExcessCost(inProgressVO.getExtraAmount());
                 }
                 stringBuilder.append("违约金( ¥");
                 stringBuilder.append(amount);
@@ -279,7 +279,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 stringBuilder.append(cost);
                 initDedDetail(dedDetailDTO, OrderViolateEnum.BEFORE.getCode(), cost, stringBuilder);
             }
-            //延期还车,结束时间小于当前时间
+            /**
+             * 延期还车
+             */
         } else if (orderPageVO.getOrderRentVehicleDetail().getEndTime() < nowTime.getMillis()) {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("违约金( ¥");
@@ -296,7 +298,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             stringBuilder.append("元");
             initDedDetail(dedDetailDTO, OrderViolateEnum.AFTER.getCode(), cost, stringBuilder);
         }
-        orderPageVO.setDedDetailDTO(dedDetailDTO);
+        orderPageVO.setDedDetailDTO(JSONObject.toJSONString(dedDetailDTO));
     }
     public void initDedDetail(DedDetailDTO dedDetailDTO, Integer type, BigDecimal cost, StringBuilder stringBuilder) {
         String detailName = null;
@@ -306,9 +308,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         } else if (type == OrderViolateEnum.AFTER.getCode()) {
             dedDetailDTO.setType(OrderViolateEnum.AFTER.getCode());
             detailName = "延期还车违约金";
-        } else if (type == OrderViolateEnum.EXCESS.getCode()) {
-            dedDetailDTO.setType(OrderViolateEnum.EXCESS.getCode());
-            detailName = "消费超额金";
         }
         //900元+违约金（￥900x2天=）1800元
         dedDetailDTO.setDeductions(stringBuilder.toString());
@@ -322,16 +321,23 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
         OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
         orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
         orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
-        List<OrderVehicleCrosstownDto> orderVehicleCrosstowns = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-        if (orderVehicleCrosstowns != null && orderVehicleCrosstowns.size() > 0) {
-            List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstowns.get(0).getUserLicenseId()).getData();
+        List<OrderVehicleCrosstownDto> orderVehicleCrosstown = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+        if (orderVehicleCrosstown != null && orderVehicleCrosstown.size() > 0) {
+            List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstown.get(0).getUserLicenseId()).getData();
             if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
                 orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
                 orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
                 orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
                 orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
             }
-
+            //设置保留金
+            for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
+                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+                        orderPageVo.setDedDetailDTO(a.getViolateDetail());
+                    }
+                }
+            }
         }
         orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
     }

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/biz/OrderVehicleCrosstownBiz.java

@@ -155,7 +155,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<OrderVehicleCrosstownDto> add(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
-        log.info("交还车参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
+        log.info("交还车参数：orderVehicleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
@@ -249,6 +249,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
         }
         Double cost = 0.0;
+        //定损扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
             for (int i = 0; i < jsonArray.size(); i++) {
@@ -258,12 +259,18 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
             }
         }
+        //延期扣除费用
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getViolateDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                 if (jsonObject != null) {
-                    cost += Double.parseDouble(jsonObject.getString("cost"));
+                    if (jsonObject.getString("cost") != null) {
+                        cost += Double.parseDouble(jsonObject.getString("cost"));
+                    }
+                    if (jsonObject.getString("excessCost") != null) {
+                        cost += Double.parseDouble(jsonObject.getString("excessCost"));
+                    }
                 }
             }
         }
@@ -382,7 +389,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     }
 
 
-
     //添加订单驾驶人信息
     public void getOrderLicense(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getLicenseIdCard())) {
@@ -412,5 +418,4 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
         return false;
     }
-
 }

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