Merge branch 'master-modify-cutAmount' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderCostEnum.java

@@ -4,12 +4,17 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum OrderCostEnum {
-    RentVehicle(1, "租车费用明细"),
+    RENT_VEHICLE("01", "租车费用明细"),
+    TOUR("02", "旅游费用明细"),
+    CANCEL_NO_START("03", "取消违约金明细"),
+    CANCEL_STARTED("04", "取消费用明细"),
+    FINLISH_ADVANCE("05", "租车费用明细"),
+    FINLISH_DELAY("06", "租车费用明细"),
     ;
     /**
      * 编码
      */
-    private Integer code;
+    private String code;
     /**
      * 类型描述
      */
@@ -17,16 +22,16 @@ public enum OrderCostEnum {
 
     private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
 
-    OrderCostEnum(Integer code, String desc){
+    OrderCostEnum(String code, String desc){
         this.code=code;
         this.desc=desc;
     }
 
-    public Integer getCode() {
+    public String getCode() {
         return code;
     }
 
-    public void setCode(Integer code) {
+    public void setCode(String code) {
         this.code = code;
     }
 

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

@@ -323,4 +323,8 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "used_day")
 	Integer usedDay;
 
+	@Column(name = "cost_detail_extend")
+	@ApiModelProperty(value = "费用其他明细 type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细")
+	private String costDetailExtend;
+
 }

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

@@ -245,6 +245,10 @@ public class OrderTourDetail implements Serializable {
 	@ApiModelProperty(value = "是否省外 1--省外；0--省内")
 	private Integer isOutside;
 
+	@Column(name = "cost_detail_extend")
+	@ApiModelProperty(value = "费用其他明细 type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细")
+	private String costDetailExtend;
+
 	@Transient
 	private List<TourUser> userVoList;
 }

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

@@ -23,6 +23,11 @@ public class InProgressVO {
      */
     BigDecimal extraAmount = BigDecimal.ZERO;
 
+    /**
+     * 实际消费金额
+     */
+    BigDecimal consumeAmount = BigDecimal.ZERO;
+
     /**
      * 已使用天数
      */

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

+package com.xxfc.platform.order.pojo.price;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CancelNoStartVO extends CostDetailExtend{
+
+    /**
+     * 违约金描述
+     */
+    private String violateDesc;
+
+    /**
+     * 违约金额
+     */
+    private BigDecimal violateAmount = BigDecimal.ZERO;
+
+    public CancelNoStartVO() {
+        this.type = CANCEL_NO_START;
+    }
+}

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

+package com.xxfc.platform.order.pojo.price;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class CancelStartedVO extends CostDetailExtend {
+    /**
+     * 消费金额（实际计费）
+     */
+    private BigDecimal consumeAmount;
+
+    /**
+     * 租车单价
+     */
+    private BigDecimal modelAmount;
+
+    /**
+     * 使用天数
+     */
+    private Integer usedDayNum;
+
+    /**
+     * 使用金额
+     */
+    private BigDecimal usedAmount;
+
+    /**
+     * 使用免费天数
+     */
+    private Integer usedfreeDayNum;
+
+    /**
+     * 使用免费金额
+     */
+    private BigDecimal usedFreeAmount;
+
+    /**
+     * 违约金描述
+     */
+    private String violateDesc;
+
+    /**
+     * 违约金金额
+     */
+    private BigDecimal violateAmount;
+}

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

+package com.xxfc.platform.order.pojo.price;
+
+import lombok.Data;
+
+@Data
+public class CostDetailExtend {
+
+    public static final int CANCEL_NO_START = 1;
+    public static final int CANCEL_STARTED = 2;
+    public static final int FINLISH_ADVANCE = 3;
+    public static final int FINLISH_DELAY = 4;
+
+    private String costDetail;
+
+    /**
+     * type：1--取消违约金；2--取消费用明细；3--提前还车费用明细；4--延期还车费用明细
+     */
+    protected Integer type;
+}

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

@@ -86,12 +86,14 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
      * @param timeLag 与开始时间的时间差
      * @param dicParentKey
      */
-    public BigDecimal rentRefundProcessCancel(BaseOrder baseOrder, BigDecimal mainItemRealAmount, Long timeLag, String dicParentKey, BigDecimal depositAmount, BigDecimal originalDeductAmount) {
+    public BigDecimal rentRefundProcessCancel(BaseOrder baseOrder, BigDecimal mainItemRealAmount, Long timeLag, String dicParentKey, BigDecimal depositAmount, BigDecimal originalDeductAmount, OrderAccountDetail oad) {
         //计算退款金额
         //商品价格 - 优惠券减免的价格
         BigDecimal originalRefundAmount = BigDecimal.ZERO.add(mainItemRealAmount);
         StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
-        OrderAccountDetail oad = new OrderAccountDetail();
+        if(null == oad) {
+            oad = new OrderAccountDetail();
+        }
         BigDecimal refundMainGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder, oad);
         refundMainGoodsAmount = refundMainGoodsAmount.setScale(2, RoundingMode.HALF_UP);
 
@@ -188,7 +190,9 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                     set("ga", goodsAmount);
                 }})).toString());
                 refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
-                orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
+                if(goodsAmount.subtract(refundGoodsAmount).compareTo(BigDecimal.ZERO) > 0) {
+                    orderAccountDetail.getDeductions().add(initDeduction(goodsAmount.subtract(refundGoodsAmount), names[1], DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT));
+                }
                 break;
             }
         }

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

@@ -6,11 +6,16 @@ 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.contant.enumerate.OrderCostEnum;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.mapper.OrderTemplateMapper;
+import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
+import com.xxfc.platform.order.pojo.price.CancelStartedVO;
+import com.xxfc.platform.order.pojo.price.CostDetailExtend;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -58,6 +63,32 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
         return template.render(map);
     }
 
+    public OrderTemplate selectByCode(String code) {
+        return selectOne(new OrderTemplate(){{
+            setCode(code);
+        }});
+    }
+
+    /**
+     * 计算费用明细
+     * @param vo
+     * @return
+     */
+    public void handleCostDetailExtend(CancelNoStartVO vo) {
+        OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_NO_START.getCode());
+        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+    }
+
+    /**
+     * 取消费用明细
+     * @param vo
+     * @return
+     */
+    public void handleCostDetailExtend(CancelStartedVO vo) {
+        OrderTemplate template = selectByCode(OrderCostEnum.CANCEL_STARTED.getCode());
+        vo.setCostDetail(result(template.getTemplate(), Dict.parse(vo)));
+    }
+
     public static void main(String[] args) {
         String tempStr = "{\"key\":\"费用明细\", \"val\":\"\", \"consumeAmount\":\"${consumeAmount}\",\"children\":[${children}]}";
         Map map = Maps.newHashMap();

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.lang.Dict;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -12,6 +13,7 @@ import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
+import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
@@ -20,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -59,6 +62,7 @@ public class OrderCalculateBiz {
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays, OrderAccountDetail oad) {
         BigDecimal refundAmount = BigDecimal.ZERO;
+        BigDecimal consumeAmount = BigDecimal.ZERO;
         InProgressVO inProgressVO = new InProgressVO();
         inProgressVO.setUsedDays(useDays);
         inProgressVO.setUsedfreeDays(freeDays);
@@ -80,7 +84,7 @@ public class OrderCalculateBiz {
                     //消费天数
                 Integer consumeDays = 0 - backFreeDays;
                     //计算使用天数的费用
-                BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
+                consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
                 List<BigDecimal> couponAmounts = Lists.newArrayList();
                 for(String tickerNo : baseOrder.getCouponTickerNos().split(",")) {
                     BigDecimal couponAmount = activityFeign.use(baseOrder.getUserId(), Lists.newArrayList(tickerNo), baseOrder.getNo(), Coupon.CHANNEL_RENT, consumeAmount, ActivityFeign.TYPE_CHECK);

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

@@ -11,9 +11,12 @@ import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+import com.xxfc.platform.order.pojo.account.OrderAccountDeduction;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import com.xxfc.platform.order.pojo.price.CancelNoStartVO;
+import com.xxfc.platform.order.pojo.price.CancelStartedVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -67,6 +70,9 @@ public class OrderCancelBiz {
     @Autowired
     OrderAccountBiz orderAccountBiz;
 
+    @Autowired
+    OrderTemplateBiz orderTemplateBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -152,6 +158,25 @@ public class OrderCancelBiz {
                         //退款子流程: 订单基础，退款描述，退款金额
                         orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), AccountTypeEnum.OUT_ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
+
+                        //如果有扣款项，则生成额外的费用明细
+                        CancelStartedVO csv = new CancelStartedVO();
+                        csv.setConsumeAmount(inProgressVO.getConsumeAmount());
+                        csv.setModelAmount(orderItem.getUnitPrice());
+                        csv.setUsedAmount(inProgressVO.getUsedAmount());
+                        csv.setUsedDayNum(inProgressVO.getUsedDays());
+                        csv.setUsedFreeAmount(inProgressVO.getUsedFreeDaysAmount());
+                        if(oad.getDeductions().size() > 0) {
+                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                                if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                    csv.setViolateAmount(deduction.getAmount());
+                                    csv.setViolateDesc(deduction.getName());
+                                }
+                            }
+                        }
+                        orderTemplateBiz.handleCostDetailExtend(csv);
+                        orvd.setCostDetailExtend(csv.getCostDetail());
+                        orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
                     }else {
                         //没到出车时间
                         //判断是否使用免费天数，并且进行扣款
@@ -165,7 +190,22 @@ public class OrderCancelBiz {
                             }
                         }
                         //退款流程
-                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount, null);
+
+                        //如果有扣款项，则生成额外的费用明细
+                        if(oad.getDeductions().size() > 0) {
+                            for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                                if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                    CancelNoStartVO cnsv = new CancelNoStartVO(){{
+                                        setViolateAmount(deduction.getAmount());
+                                        setViolateDesc(deduction.getName());
+                                    }};
+                                    orderTemplateBiz.handleCostDetailExtend(cnsv);
+                                    orvd.setCostDetailExtend(cnsv.getCostDetail());
+                                    orderRentVehicleBiz.updateSelectiveByIdRe(orvd);
+                                }
+                            }
+                        }
                     }
 
                     //已付款的取消订单发送消息
@@ -199,8 +239,24 @@ public class OrderCancelBiz {
                     if(SYS_TRUE.equals(otd.getIsOutside())) {
                         key = TOUR_REFUND;
                     }
+
                     //退款流程
-                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO);
+                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO, oad);
+
+                    //如果有扣款项，则生成额外的费用明细
+                    if(oad.getDeductions().size() > 0) {
+                        for(OrderAccountDeduction deduction : oad.getDeductions()) {
+                            if(DeductionTypeEnum.VIOLATE_CANCEL.getCode().equals(deduction.getType())) {
+                                CancelNoStartVO cnsv = new CancelNoStartVO(){{
+                                    setViolateAmount(deduction.getAmount());
+                                    setViolateDesc(deduction.getName());
+                                }};
+                                orderTemplateBiz.handleCostDetailExtend(cnsv);
+                                otd.setCostDetailExtend(cnsv.getCostDetail());
+                                orderTourDetailBiz.updateSelectiveByIdRe(otd);
+                            }
+                        }
+                    }
 
                     //站点总人数减少
                     tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));
@@ -213,10 +269,11 @@ public class OrderCancelBiz {
                     setOrderId(baseOrder.getId());
                 }});
 
-                //取消租车预定
+                //取消租车预定 和 记录生成额外的费用明细
                 //已支付,并且是待出行状态，取消预约
                 if(OrderStatusEnum.ORDER_TOSTART.getCode().equals(baseOrder.getStatus()) && SYS_TRUE.equals(baseOrder.getHasPay())){
                     vehicleFeign.rentUnbookVehicle(orvd.getBookRecordId());
+
                 }else {
                     //未支付，拒绝之前的预约
                     RestResponse<Integer> restResponse = vehicleFeign.rentRejectVehicleBooking(orvd.getBookRecordId());

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

@@ -15,7 +15,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
@@ -25,18 +24,15 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
-import com.xxfc.platform.order.pojo.order.OrderItemDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
-import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.RentVehicleBookDTO;
 import com.xxfc.platform.vehicle.pojo.vo.AccompanyingItemVo;
 import lombok.Data;
@@ -414,7 +410,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @return
      */
     private void costDetail(RentVehiclePriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode());
+        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
             put("vehicleAmount", vo.getVehicleAmount());

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

@@ -3,7 +3,6 @@ package com.xxfc.platform.order.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.StrUtil;
-import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -12,7 +11,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
-import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
@@ -312,7 +310,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
      * @return
      */
     private void costDetail(TourPriceVO vo, String children) {
-        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode());
+        OrderTemplate template = orderTemplateBiz.selectById(OrderCostEnum.RENT_VEHICLE.getCode());
         template.setTemplate(orderTemplateBiz.result(template.getTemplate(), new HashMap(){{
             put("children", children);
         }}));