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

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
#	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/contant/enumerate/AccountTypeEnum.java

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum AccountTypeEnum {
+    //账款类型 1*--入账；2*--出账
+    //账款类型 记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款
+    In_ORDER_PAY(101, "订单支付"),
+    OUT_ORDER_FUND(201, "订单款"),
+    OUT_DEPOSIT(202, "所有押金"),
+    OUT_PART_DEPOSIT(203, "部分押金（扣除该扣除的 + 保留违章预备金）"),
+    OUT_RESIDUE_DEPOSIT(204, "剩余押金（扣除该扣除的）"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+            //Maps.newHashMap();
+
+    static{
+        for(AccountTypeEnum enumE : AccountTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+        }
+    }
+
+    AccountTypeEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.contant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum DeductionTypeEnum {
+    //账款类型 1--违约金；2--消费金额；3--赔偿金（定损）；4--违章扣款
+    VIOLATE_CANCEL(101, "提前取消违约金"),
+    VIOLATE_ADVANCE(102, "提前还车违约金"),
+    VIOLATE_DELAY(103, "延迟还车违约金"),
+    EXTRA(201, "消费金额"),
+    DAMAGES(301, "赔偿金（定损）"),
+    VIOLATE_TRAFFIC_DEDUCT(401, "违章扣款"),
+    VIOLATE_TRAFFIC_KEEP(402, "违章扣款保留金"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+            //Maps.newHashMap();
+
+    static{
+        for(DeductionTypeEnum enumE : DeductionTypeEnum.values()){
+            codeAndDesc.put(enumE.getCode(),enumE.getDesc());
+        }
+    }
+
+    DeductionTypeEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}
\ No newline at end of file

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

+package com.xxfc.platform.order.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 订单帐目
+ * 
+ * @author zhoujw
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+@Data
+@Table(name = "order_account")
+public class OrderAccount implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	/**
+     *  主键
+     */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键")
+    private Integer id;
+	
+	/**
+     *  订单id
+     */
+    @Column(name = "order_id")
+	@ApiModelProperty(value = "订单id")
+    private Integer orderId;
+	
+	    /**
+     *  账款对应的流水号
+     */
+    @Column(name = "trade_no")
+	@ApiModelProperty(value = "账款对应的流水号")
+    private String tradeNo;
+	
+	    /**
+     *  记账时间
+     */
+    @Column(name = "account_time")
+	@ApiModelProperty(value = "记账时间")
+    private Long accountTime;
+	
+	    /**
+     *  记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款
+     */
+    @Column(name = "account_type")
+	@ApiModelProperty(value = "记帐类型 101--订单支付；201--取消订单退款；202--全部押金退款；203--部分押金退款；204--剩余押金退款")
+    private Integer accountType;
+	
+	    /**
+     *  账款状态 1--成功；2--失败
+     */
+    @Column(name = "account_status")
+	@ApiModelProperty(value = "账款状态 1--成功；2--失败")
+    private Integer accountStatus;
+	
+	    /**
+     *  账款金额
+     */
+    @Column(name = "account_amount")
+	@ApiModelProperty(value = "账款金额")
+    private BigDecimal accountAmount;
+	
+	    /**
+     *  账款说明
+     */
+    @Column(name = "account_desc")
+	@ApiModelProperty(value = "账款说明")
+    private String accountDesc;
+	
+	    /**
+     *  账款详情
+     */
+    @Column(name = "account_detail")
+	@ApiModelProperty(value = "账款详情")
+    private String accountDetail;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  原金额
+     */
+    @Column(name = "original_amount")
+	@ApiModelProperty(value = "原金额")
+    private BigDecimal originalAmount;
+	
+	    /**
+     *  扣除金额
+     */
+    @Column(name = "deduct_amount")
+	@ApiModelProperty(value = "扣除金额")
+    private BigDecimal deductAmount;
+	
+
+}

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

+package com.xxfc.platform.order.pojo.account;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class OrderAccountDeduction {
+
+    public static final int ORIGIN_ORDER = 1;
+    public static final int ORIGIN_DEPOSIT = 2;
+
+    /**
+     * 名称
+     */
+    String name;
+
+    /**
+     * 类型
+     */
+    Integer type;
+
+    /**
+     * 来源 1--订单款  2--押金
+     */
+    Integer origin;
+
+    /**
+     * 金额
+     */
+    BigDecimal amount;
+}

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

+package com.xxfc.platform.order.pojo.account;
+
+import lombok.Data;
+import org.assertj.core.util.Lists;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderAccountDetail {
+    BigDecimal orderAmount;
+    BigDecimal depositAmount;
+    List<OrderAccountDeduction> deductions = Lists.newArrayList();
+}

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

@@ -301,7 +301,7 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
             oad.getDeductions().add(new OrderAccountDeduction(){{
                 setOrigin(OrderAccountDeduction.ORIGIN_DEPOSIT);
                 setAmount(illegalReserve);
-                setType(DeductionTypeEnum.VIOLATE_TRAFFIC_KEEP.getCode());
+                setType(DeductionTypeEnum.KEEP_VIOLATE_TRAFFIC.getCode());
             }});
             BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
             BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);

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

@@ -46,248 +46,286 @@ import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 @Service
 @Slf4j
 public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
-    @Autowired
-    ThirdFeign thirdFeign;
-
-    @Autowired
-    BaseOrderBiz baseOrderBiz;
-
-    @Autowired
-    OrderRentVehicleBiz orderRentVehicleBiz;
-
-    @Autowired
-    OrderVehicleCrosstownBiz crosstownBiz;
-
-    @Autowired
-    OrderViolationBiz orderViolationBiz;
-
-    @Autowired
-    OrderMsgBiz orderMsgBiz;
-
-    @Autowired
-    UserFeign userFeign;
-
-    @Autowired
-    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
-
-    /**
-     * 退还部分押金
-     * @param orderMQDTO
-     */
-    public void refundPartDeposit(OrderMQDTO orderMQDTO){
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
-
-        //未退还， 进行挂起保留违章预备金 的退还
-        if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {
-            Integer crosstownTypeEnum;
-            DepositRefundStatus depositRefundRecordStatus;
-            //判断是否定损过
-            if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
-                crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
-                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUNDARRIVAL;
-            }else {
-                crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
-                depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL;
-            }
-            OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
-                setOrderId(orderMQDTO.getId());
-                setType(crosstownTypeEnum);
-            }});
-
-            if(null == crosstown) {
-                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId()));
-            }
-
-            if(null == crosstown.getRestDeposit()
-                    || crosstown.getRestDeposit().subtract(illegalReserve).compareTo(BigDecimal.ZERO) < 0 ){
-                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退第一笔押金剩余金额异常，异常记录为："+ crosstown.getId()));
-            }
-
-            //还车扣除款 剩余的 钱，再减去违章预备金
-            BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
-            BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
-            String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
-            try{
-                if(null != crosstown.getDedDetail()) {
-                    List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(crosstown.getDedDetail()), DedDetailDTO.class);
-                    for(DedDetailDTO ddd : dddList) {
-                        refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
-                    }
-                }
-            }catch (Exception e) {
-                log.error("crosstown.getDedDetail() crosstown id :"+crosstown.getId() +" 转换失败");
-            }
-            refundDesc += ")";
-            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);
-
-//            DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(crosstown.getId(), depositRefundRecordStatus);
-//            depositRefundRecord.setIscomplete(Boolean.TRUE);
-//            orderDepositRefundRecordBiz.updateSelectiveById(depositRefundRecord);
-            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
-            orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
-        }
-    }
-
-    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, RefundTypeEnum refundTypeEnum) {
-        //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDesc, originalRefundAmount, refundAmont, refundTypeEnum.getCode(), refundStatus);
-        //设置剩余没有返还的钱
-        orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
-            setId(orvd.getId());
-            setReturnPayResidue(residueAmount);
-        }});
-    }
-
-    /**
-     * 租车（包括旅游）退款流程
-     * @param baseOrder
-     * @param timeLag 与开始时间的时间差
-     * @param dicParentKey
-     */
-    public BigDecimal rentRefundProcess(BaseOrder baseOrder, Long timeLag, String dicParentKey) {
-        //计算退款金额
-            //商品价格 - 优惠券减免的价格
-        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
-        StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
-        BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
-        refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
-
-        //退款金额
-        BigDecimal refundAmount = refundGoodsAmount;
-
-        //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
-        return refundAmount;
-    }
-
-    /**
-     * 租车押金退款流程
-     * @param baseOrder
-     * @param depositAmount
-     * @param timeLag 与开始时间的时间差
-     * @param dicParentKey
-     * @param originalDeductAmount
-     */
-    public BigDecimal rentRefundDepositProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey, BigDecimal originalDeductAmount) {
-        // 1、押金 + 租金(规则扣除)
-        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(depositAmount);
-        BigDecimal refundAmount = BigDecimal.ZERO.add(depositAmount);
-        StringBuilder refundDescBuilder = new StringBuilder("取消订单押金退款:");
-        if(null != originalDeductAmount && BigDecimal.ZERO.compareTo(originalDeductAmount) < 0) {
-            //通过原扣除款 计算剩余款
-            BigDecimal residueAmount = calculateRefund(originalDeductAmount, timeLag, dicParentKey, refundDescBuilder);
-            residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
-
-            //退款金额 ：押金 - (原扣除款 - 剩余款)   即： 押金 - （免费天数对应的钱 - 剩余款）
-            refundAmount = originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount));
-        }
-
-        //触发押金退款
-        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
-        return refundAmount;
-    }
-
-    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
-        BigDecimal refundGoodsAmount = goodsAmount;
-
-        //根据时间处理goodsAmount
-        //获取出发时间 到现在 距离时间
-        Integer hourLag = Long.valueOf(timeLag/(1000L * 60L * 60L)).intValue();
-
-        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
-        Set<Dictionary> rentRefunds = dictionaryMap.get(dicParentKey).getChildrens();
-
-        for(com.xxfc.platform.universal.entity.Dictionary dic : rentRefunds) {
-            if(StrUtil.isBlank(dic.getName())) {
-                continue;
-            }
-            String[] names = dic.getName().split("\\|");
-            if(names.length < 2) {
-                continue;
-            }
-
-            //符合范围
-            if(IntervalUtil.staticIsInTheInterval(hourLag.toString(), names[0])){
-                refundGoodsAmount = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
-                    //ga : goodsAmount
-                    set("ga", goodsAmount);
-                }})).toString());
-                refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
-                break;
-            }
-        }
-
-        return refundGoodsAmount;
-    }
-
-    /**
-     * 退款子流程
-     * @param baseOrder
-     * @param refundDesc
-     * @param refundAmount
-     * @param refundType
-     * @param refundStatus
-     */
-    public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus) {
-        String refundTradeNo = null;
-        //0 小于 退款金额
-        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
-            OrderRefundVo orv = new OrderRefundVo();
-            orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
-            orv.setOrderNo(baseOrder.getNo());
-            orv.setRefundDesc(refundDesc+ refundAmount.toString());
-            orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
-            ObjectRestResponse<String> result = thirdFeign.refund(orv);
-            refundTradeNo = result.getData();
-            if(null == refundTradeNo) {
-                log.error("退款没有refundTradeNo，订单号为："+ baseOrder.getNo()+ ", 微服务调用结果为"+ JSONUtil.toJsonStr(result));
-            }
-        }
-
-        //记录订单退款记录
-        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType);
-
-        //更新订单的退款状态和退款时间
-        BaseOrder updateBaseOrder = new BaseOrder();
-        updateBaseOrder.setId(baseOrder.getId());
-        updateBaseOrder.setRefundStatus(refundStatus);
-        updateBaseOrder.setRefundTime(System.currentTimeMillis());
-        updateBaseOrder.setVersion(baseOrder.getVersion());
-        if(SYS_TRUE.equals(flag) && null != refundStatus) {
-            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder), baseOrder);
-        }
-    }
-
-    /**
-     * 记录订单退款记录
-     * @param orderId
-     * @param refundDesc
-     * @param refundAmount
-     * @param refundTradeNo
-     */
-    private Integer addOrderRefund(Integer orderId, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, String refundTradeNo, Integer refundType) {
-        //如果返回的流水为空，则当做失败
-        Integer refundStatus = SYS_TRUE;
-        if(StrUtil.isBlank(refundTradeNo)) {
-            refundStatus = SYS_FALSE;
-        }
-
-        //创建订单退款记录
-        OrderRefund orderRefund = new OrderRefund(){{
-            setOrderId(orderId);
-            setRefundTime(System.currentTimeMillis());
-            setTradeNo(refundTradeNo);
-            setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
-        }};
-        orderRefund.setOriginalRefundAmount(originalRefundAmount);
-        orderRefund.setDeductAmount(originalRefundAmount.subtract(refundAmount));
-        orderRefund.setRefundAmount(refundAmount);
-        orderRefund.setRefundDesc(refundDesc);
-        orderRefund.setRefundStatus(refundStatus);
-        orderRefund.setRefundType(refundType);
-        insertSelective(orderRefund);
-
-        return refundStatus;
-    }
+//    @Autowired
+//    ThirdFeign thirdFeign;
+//
+//    @Autowired
+//    BaseOrderBiz baseOrderBiz;
+//
+//    @Autowired
+//    OrderRentVehicleBiz orderRentVehicleBiz;
+//
+//    @Autowired
+//    OrderVehicleCrosstownBiz crosstownBiz;
+//
+//    @Autowired
+//    OrderViolationBiz orderViolationBiz;
+//
+//    @Autowired
+//    OrderMsgBiz orderMsgBiz;
+//
+//    @Autowired
+//    UserFeign userFeign;
+//
+//    @Autowired
+//    OrderDepositRefundRecordBiz orderDepositRefundRecordBiz;
+//
+//    /**
+//     * 退还部分押金
+//     * @param orderMQDTO
+//     */
+//    public void refundPartDeposit(OrderMQDTO orderMQDTO){
+//        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//        BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.ILLEGAL_RESERVE).getDetail());
+//
+//        //未退还， 进行挂起保留违章预备金 的退还
+//        if(RefundStatusEnum.NONE.getCode().equals(orderMQDTO.getRefundStatus())) {
+//            Integer crosstownTypeEnum;
+//            DepositRefundStatus depositRefundRecordStatus;
+//            //判断是否定损过
+//            if(SYS_TRUE.equals(orderMQDTO.getOrderRentVehicleDetail().getFixedLossStatus())) {
+//                crosstownTypeEnum = CrosstownTypeEnum.FIXED_LOSS.getCode();
+//                depositRefundRecordStatus = DepositRefundStatus.FIXLOSSREFUNDARRIVAL;
+//            }else {
+//                crosstownTypeEnum = CrosstownTypeEnum.ARRIVE.getCode();
+//                depositRefundRecordStatus = DepositRefundStatus.REFUNDARRIVAL;
+//            }
+//            OrderVehicleCrosstown crosstown = crosstownBiz.selectOne(new OrderVehicleCrosstown(){{
+//                setOrderId(orderMQDTO.getId());
+//                setType(crosstownTypeEnum);
+//            }});
+//
+//            if(null == crosstown) {
+//                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退款第一部分押金失败，获取不了还车/定损记录，订单号："+ orderMQDTO.getId()));
+//            }
+//
+//            if(null == crosstown.getRestDeposit()
+//                    || crosstown.getRestDeposit().subtract(illegalReserve).compareTo(BigDecimal.ZERO) < 0 ){
+//                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("退第一笔押金剩余金额异常，异常记录为："+ crosstown.getId()));
+//            }
+//
+//            //还车扣除款 剩余的 钱，再减去违章预备金
+//            BigDecimal refundAmont = crosstown.getRestDeposit().subtract(illegalReserve);
+//            BigDecimal originalRefundAmount = crosstown.getRestDeposit().add(crosstown.getDeductionCost()).subtract(illegalReserve);
+//            String refundDesc = "退还押金："+ refundAmont.toString()+ "(已扣除 违章预备金："+ illegalReserve.toString();
+//            try{
+//                if(null != crosstown.getDedDetail()) {
+//                    List<DedDetailDTO> dddList = JSONUtil.toList(JSONUtil.parseArray(crosstown.getDedDetail()), DedDetailDTO.class);
+//                    for(DedDetailDTO ddd : dddList) {
+//                        refundDesc += ", "+ ddd.getDeductions()+ ":"+ ddd.getCost();
+//                    }
+//                }
+//            }catch (Exception e) {
+//                log.error("crosstown.getDedDetail() crosstown id :"+crosstown.getId() +" 转换失败");
+//            }
+//            refundDesc += ")";
+//            refundTrigger(orderMQDTO, orderMQDTO.getOrderRentVehicleDetail(), illegalReserve, originalRefundAmount, refundAmont, refundDesc, RefundStatusEnum.RESIDUE_ILLEGAL.getCode(), RefundTypeEnum.PART_DEPOSIT);
+//
+////            DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(crosstown.getId(), depositRefundRecordStatus);
+////            depositRefundRecord.setIscomplete(Boolean.TRUE);
+////            orderDepositRefundRecordBiz.updateSelectiveById(depositRefundRecord);
+//            orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), depositRefundRecordStatus);
+//            orderMsgBiz.handelMsgDeposit(orderMQDTO.getOrderRentVehicleDetail(), orderMQDTO, userFeign.userDetailById(orderMQDTO.getUserId()).getData());
+//        }
+//    }
+//
+//    public void refundTrigger(BaseOrder baseOrder, OrderRentVehicleDetail orvd, BigDecimal residueAmount, BigDecimal originalRefundAmount, BigDecimal refundAmont, String refundDesc, Integer refundStatus, RefundTypeEnum refundTypeEnum) {
+//        //退款子流程: 订单基础，退款描述，退款金额
+//        refundSubProcess(baseOrder, refundDesc, originalRefundAmount, refundAmont, refundTypeEnum.getCode(), refundStatus);
+//        //设置剩余没有返还的钱
+//        orderRentVehicleBiz.updateSelectiveById(new OrderRentVehicleDetail(){{
+//            setId(orvd.getId());
+//            setReturnPayResidue(residueAmount);
+//        }});
+//    }
+//
+//    /**
+//     * 租车（包括旅游）退款流程
+//     * @param baseOrder
+//     * @param timeLag 与开始时间的时间差
+//     * @param dicParentKey
+//     */
+//    public BigDecimal rentRefundProcess(BaseOrder baseOrder, Long timeLag, String dicParentKey) {
+//        //计算退款金额
+//            //商品价格 - 优惠券减免的价格
+//        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
+//        StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
+//        BigDecimal refundGoodsAmount = calculateRefund(originalRefundAmount, timeLag, dicParentKey, refundDescBuilder);
+//        refundGoodsAmount = refundGoodsAmount.setScale(2, RoundingMode.HALF_UP);
+//
+//        //退款金额
+//        BigDecimal refundAmount = refundGoodsAmount;
+//
+//        //退款子流程: 订单基础，退款描述，退款金额
+//        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
+//        return refundAmount;
+//    }
+//
+//    /**
+//     * 租车押金退款流程
+//     * @param baseOrder
+//     * @param depositAmount
+//     * @param timeLag 与开始时间的时间差
+//     * @param dicParentKey
+//     * @param originalDeductAmount
+//     */
+//    public BigDecimal rentRefundDepositProcess(BaseOrder baseOrder, BigDecimal depositAmount, Long timeLag, String dicParentKey, BigDecimal originalDeductAmount) {
+//        // 1、押金 + 租金(规则扣除)
+//        BigDecimal originalRefundAmount = BigDecimal.ZERO.add(depositAmount);
+//        BigDecimal refundAmount = BigDecimal.ZERO.add(depositAmount);
+//        StringBuilder refundDescBuilder = new StringBuilder("取消订单押金退款:");
+//        if(null != originalDeductAmount && BigDecimal.ZERO.compareTo(originalDeductAmount) < 0) {
+//            //通过原扣除款 计算剩余款
+//            BigDecimal residueAmount = calculateRefund(originalDeductAmount, timeLag, dicParentKey, refundDescBuilder);
+//            residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+//
+//            //退款金额 ：押金 - (原扣除款 - 剩余款)   即： 押金 - （免费天数对应的钱 - 剩余款）
+//            refundAmount = originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount));
+//        }
+//
+//        //触发押金退款
+//        refundSubProcess(baseOrder, refundDescBuilder.toString(), originalRefundAmount, refundAmount, RefundTypeEnum.DEPOSIT.getCode(), RefundStatusEnum.ALL.getCode());
+//        return refundAmount;
+//    }
+//
+//    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
+//        BigDecimal refundGoodsAmount = goodsAmount;
+//
+//        //根据时间处理goodsAmount
+//        //获取出发时间 到现在 距离时间
+//        Integer hourLag = Long.valueOf(timeLag/(1000L * 60L * 60L)).intValue();
+//
+//        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+//        Set<Dictionary> rentRefunds = dictionaryMap.get(dicParentKey).getChildrens();
+//
+//        for(com.xxfc.platform.universal.entity.Dictionary dic : rentRefunds) {
+//            if(StrUtil.isBlank(dic.getName())) {
+//                continue;
+//            }
+//            String[] names = dic.getName().split("\\|");
+//            if(names.length < 2) {
+//                continue;
+//            }
+//
+//            //符合范围
+//            if(IntervalUtil.staticIsInTheInterval(hourLag.toString(), names[0])){
+//                refundGoodsAmount = new BigDecimal((IntervalUtil.evaluate(dic.getDetail(), new MapContext(){{
+//                    //ga : goodsAmount
+//                    set("ga", goodsAmount);
+//                }})).toString());
+//                refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
+//                break;
+//            }
+//        }
+//
+//        return refundGoodsAmount;
+//    }
+//
+//    /**
+//     * 退款子流程
+//     * @param baseOrder
+//     * @param refundDesc 退款描述
+//     * @param refundAmount 退款金额
+//     * @param refundType 退款类型
+//     * @param refundStatus 退款状态
+//     */
+//    public void refundSubProcess(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus) {
+//        String refundTradeNo = null;
+//        //0 小于 退款金额
+//        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
+//            OrderRefundVo orv = new OrderRefundVo();
+//            orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+//            orv.setOrderNo(baseOrder.getNo());
+//            orv.setRefundDesc(refundDesc+ refundAmount.toString());
+//            orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
+//            ObjectRestResponse<String> result = thirdFeign.refund(orv);
+//            refundTradeNo = result.getData();
+//            if(null == refundTradeNo) {
+//                log.error("退款没有refundTradeNo，订单号为："+ baseOrder.getNo()+ ", 微服务调用结果为"+ JSONUtil.toJsonStr(result));
+//            }
+//        }
+//
+//        //记录订单退款记录
+//        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType);
+//
+//        //更新订单的退款状态和退款时间
+//        BaseOrder updateBaseOrder = new BaseOrder();
+//        updateBaseOrder.setId(baseOrder.getId());
+//        updateBaseOrder.setRefundStatus(refundStatus);
+//        updateBaseOrder.setRefundTime(System.currentTimeMillis());
+//        updateBaseOrder.setVersion(baseOrder.getVersion());
+//        if(SYS_TRUE.equals(flag) && null != refundStatus) {
+//            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder), baseOrder);
+//        }
+//    }
+//
+//    /**
+//     * 退款子流程
+//     * @param baseOrder
+//     * @param refundDesc 退款描述
+//     * @param refundAmount 退款金额
+//     * @param refundType 退款类型
+//     * @param refundStatus 退款状态
+//     */
+//    public void refundSubProcessNew(BaseOrder baseOrder, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, Integer refundType, Integer refundStatus) {
+//        String refundTradeNo = null;
+//        //0 小于 退款金额
+//        if(BigDecimal.ZERO.compareTo(refundAmount) < 0) {
+//            OrderRefundVo orv = new OrderRefundVo();
+//            orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+//            orv.setOrderNo(baseOrder.getNo());
+//            orv.setRefundDesc(refundDesc+ refundAmount.toString());
+//            orv.setRefundAmount(refundAmount.multiply(new BigDecimal("100")).intValue());
+//            ObjectRestResponse<String> result = thirdFeign.refund(orv);
+//            refundTradeNo = result.getData();
+//            if(null == refundTradeNo) {
+//                log.error("退款没有refundTradeNo，订单号为："+ baseOrder.getNo()+ ", 微服务调用结果为"+ JSONUtil.toJsonStr(result));
+//            }
+//        }
+//
+//        //记录订单退款记录
+//        Integer flag = addOrderRefund(baseOrder.getId(), refundDesc, originalRefundAmount, refundAmount, refundTradeNo, refundType);
+//
+//        //更新订单的退款状态和退款时间
+//        BaseOrder updateBaseOrder = new BaseOrder();
+//        updateBaseOrder.setId(baseOrder.getId());
+//        updateBaseOrder.setRefundStatus(refundStatus);
+//        updateBaseOrder.setRefundTime(System.currentTimeMillis());
+//        updateBaseOrder.setVersion(baseOrder.getVersion());
+//        if(SYS_TRUE.equals(flag) && null != refundStatus) {
+//            BeanUtil.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateBaseOrder), baseOrder);
+//        }
+//    }
+//
+//    /**
+//     * 记录订单退款记录
+//     * @param orderId
+//     * @param refundDesc
+//     * @param refundAmount
+//     * @param refundTradeNo
+//     */
+//    private Integer addOrderRefund(Integer orderId, String refundDesc, BigDecimal originalRefundAmount, BigDecimal refundAmount, String refundTradeNo, Integer refundType) {
+//        //如果返回的流水为空，则当做失败
+//        Integer refundStatus = SYS_TRUE;
+//        if(StrUtil.isBlank(refundTradeNo)) {
+//            refundStatus = SYS_FALSE;
+//        }
+//
+//        //创建订单退款记录
+//        OrderRefund orderRefund = new OrderRefund(){{
+//            setOrderId(orderId);
+//            setRefundTime(System.currentTimeMillis());
+//            setTradeNo(refundTradeNo);
+//            setRefundType(RefundTypeEnum.ORDER_FUND.getCode());
+//        }};
+//        orderRefund.setOriginalRefundAmount(originalRefundAmount);
+//        orderRefund.setDeductAmount(originalRefundAmount.subtract(refundAmount));
+//        orderRefund.setRefundAmount(refundAmount);
+//        orderRefund.setRefundDesc(refundDesc);
+//        orderRefund.setRefundStatus(refundStatus);
+//        orderRefund.setRefundType(refundType);
+//        insertSelective(orderRefund);
+//
+//        return refundStatus;
+//    }
 }
\ No newline at end of file

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

@@ -80,6 +80,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         return selectById(id);
     }
 
+    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
+
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) {
 
         List<OrderVehicleCrosstownDto> list = mapper.selectByOrderId(orderVehicleCrosstownDto);
@@ -166,6 +168,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (baseOrder == null) {
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
+
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());

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.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.common.exception.BaseException;
-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.app.entity.Cofig;
 import com.xxfc.platform.app.feign.ConfigFeign;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderItemBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
-import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
-import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
+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.universal.constant.DictionaryKey;
-import com.xxfc.platform.universal.dto.SmsTemplateDTO;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.HOUR_MINUTE_FORMATTE_HUTOOL;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
  * 订单退款记录表
@@ -71,22 +54,33 @@ public class OrderCalculateBiz {
     @Autowired
     OrderItemBiz orderItemBiz;
 
-    public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays) {
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
+    public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays, OrderAccountDetail oad) {
+        BigDecimal refundAmount = BigDecimal.ZERO;
+        InProgressVO inProgressVO = new InProgressVO();
+        inProgressVO.setUsedDays(useDays);
+        inProgressVO.setUsedfreeDays(freeDays);
+        inProgressVO.setUsedAmount(orderItem.getUnitPrice().multiply(new BigDecimal(useDays+ "")));
+        inProgressVO.setUsedFreeDaysAmount(orderItem.getUnitPrice().multiply(new BigDecimal(freeDays+ "")));
+
         //计算：剩余免费天数
         Integer backFreeDays = freeDays - useDays;
+        //待返还的免费天数
+        List<String> backCouponNos = Lists.newArrayList();
+        //剩余天数
+        Integer residueDays = orderItem.getTotalNum() - useDays;
         //过了出发时间取消订单 ，优先使用免费天数
         if(backFreeDays <= 0) {
-            //大于总天数 只返回押金
-            if(useDays >= orderItem.getTotalNum()) {
-                //退押金
-                //orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
-            }else {
+            //使用天数 小于 总天数
+            if(useDays < orderItem.getTotalNum()) {
                 //需要扣除订单费用
                 //判断是否达到优惠券条件 不符合则返还优惠券
+                    //消费天数
                 Integer consumeDays = 0 - backFreeDays;
                     //计算使用天数的费用
                 BigDecimal consumeAmount = orderItem.getUnitPrice().multiply(new BigDecimal(consumeDays+""));
-                List<String> backCouponNos = Lists.newArrayList();
                 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);
@@ -97,14 +91,60 @@ public class OrderCalculateBiz {
                         backCouponNos.add(tickerNo);
                     }
                 }
+
+                for(BigDecimal couponAmount : couponAmounts) {
+                    consumeAmount = consumeAmount.subtract(couponAmount);
+                }
+
+                if(consumeAmount.compareTo(orderItem.getRealAmount()) > 0) {
+                    //消费金额 大于真实的金额 增加额外费用
+                    inProgressVO.setExtraAmount(consumeAmount.subtract(orderItem.getRealAmount()));
+//                    consumeAmount = orderItem
+                    OrderAccountDeduction extraDeduction = orderAccountBiz.initDeduction(inProgressVO.getExtraAmount(), "消费额外费用", DeductionTypeEnum.EXTRA, OrderAccountDeduction.ORIGIN_DEPOSIT);
+                    oad.getDeductions().add(extraDeduction);
+                }else {
+                    //否则，设置返回钱
+                    refundAmount = refundAmount.add(orderItem.getRealAmount().subtract(consumeAmount));
+                }
+            } else {
+
             }
         }else {
             //返回剩余免费天数，返回优惠券，订单款
+            refundAmount = refundAmount.add(orderItem.getRealAmount());
+            inProgressVO.setBackFreeDays(backFreeDays);
 
+        }
 
+        inProgressVO.setRefundOrderAmount(refundAmount);
+        inProgressVO.setBackCoupons(backCouponNos);
+
+        //计算违约金
+            //residueDays * 身份价格
+        if(residueDays > 0) {
+            if(residueDays > 2) {
+                residueDays = 2;
+            }
+            inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal((residueDays + ""))));
+            OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT);
+            oad.getDeductions().add(violateDeduction);
+        }else if(residueDays < 0){
+            //如果订单 出发中 或者 已完成 或者定损中
+            if(OrderStatusEnum.ORDER_WAIT.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FINISH.equals(baseOrder.getStatus()) ||
+                    OrderStatusEnum.ORDER_FIXED_LOSS.equals(baseOrder.getStatus())) {
+                Integer overDays = 0 - residueDays;
+                if(overDays > 2) {
+                    overDays = 2;
+                }
+                //超过的天数 * 200% * 单价
+                inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal(2+ "")).multiply(new BigDecimal((overDays + ""))));
+                OrderAccountDeduction violateDeduction = orderAccountBiz.initDeduction(inProgressVO.getViolateAmount(), "违约金", DeductionTypeEnum.VIOLATE_CANCEL, OrderAccountDeduction.ORIGIN_DEPOSIT);
+                oad.getDeductions().add(violateDeduction);
+            }
         }
 
-        return new InProgressVO();
+        return inProgressVO;
     }
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {
@@ -113,6 +153,6 @@ public class OrderCalculateBiz {
             setOrderId(baseOrder.getId());
         }});
         Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, null);
     }
 }
\ No newline at end of file

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

 package com.xxfc.platform.order.biz.inner;
 
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 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.*;
 import com.xxfc.platform.order.contant.enumerate.*;
 import com.xxfc.platform.order.entity.*;
+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.tour.feign.TourFeign;
@@ -16,7 +17,6 @@ import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
-import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +62,9 @@ public class OrderCancelBiz {
     @Autowired
     OrderCalculateBiz orderCalculateBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -110,6 +113,8 @@ public class OrderCancelBiz {
                 setVersion(baseOrder.getVersion());
             }};
             BaseOrder hasUpdateOrder = baseOrderBiz.updateSelectiveByIdReT(updateOrder);
+            InProgressVO inProgressVO = new InProgressVO();
+            OrderAccountDetail oad = new OrderAccountDetail();
 
             //触发退款流程
             //判断是否已支付
@@ -135,10 +140,17 @@ public class OrderCancelBiz {
                     //获取出发时间 到现在 距离时间
                     Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
                     if(timeLag < 0 ) {
+                        //开始时间当天时间戳
+                        Long beginOfStartDay = DateUtil.beginOfDay(DateUtil.date(orvd.getStartTime())).getTime();
                         //计算：使用天数 当前时间 - 开始时间的0时0分0秒
-                        Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
+                        Long useTimeLag = System.currentTimeMillis() - beginOfStartDay;
                         Integer useDays = new BigDecimal(useTimeLag + "").divide(new BigDecimal((24 * 60 * 60 * 1000)+ "")).setScale(0, BigDecimal.ROUND_UP).intValue();
-                        orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+                        inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays, oad);
+                        oad.setDepositAmount(orvd.getDeposit().subtract(inProgressVO.getExtraAmount()).subtract(inProgressVO.getViolateAmount()));
+                        oad.setOrderAmount(inProgressVO.getRefundOrderAmount());
+                        //结合
+                        //退款子流程: 订单基础，退款描述，退款金额
+                        orderAccountBiz.refundSubProcess(baseOrder, "", baseOrder.getRealAmount().subtract(orvd.getDeposit()), oad.getDepositAmount().add(oad.getOrderAmount()), RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode(), oad);
 
                     }else {
                         //没到出车时间
@@ -147,27 +159,28 @@ public class OrderCancelBiz {
                             freeDayAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
 
                             //违约金封顶 租车身份价 * 2天
-                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal("2"));
+                            BigDecimal topAmount = orderItem.getUnitPrice().multiply(new BigDecimal(2+ ""));
                             if(freeDayAmount.compareTo(topAmount) > 0) {
                                 freeDayAmount = freeDayAmount;
                             }
                         }
-                    }
-
 
+                        orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem.getRealAmount(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);
+                    }
 
                     //退款流程
                         //退订单款
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
-
-                        //退押金
-                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+//                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);
+//
+//                      //退押金
+//                    orderRefundBiz.rentRefundDepositProcess(hasUpdateOrder, orvd.getDeposit(), timeLag, APP_ORDER+ "_"+ RENT_REFUND, freeDayAmount);
+//
+//                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, orderItem, timeLag, APP_ORDER+ "_"+ RENT_REFUND, orvd.getDeposit(), freeDayAmount);freeDayAmount
 
                     //已付款的取消订单发送消息
                     try {
                         AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
                         //处理后台用户提醒短信的发送
-//                        orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_CANCEL);
                         orderMsgBiz.handelMsgCancel(orvd, otd, omd, baseOrder, appUserDTO);
                     }catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -177,15 +190,26 @@ public class OrderCancelBiz {
                     otd = orderTourDetailBiz.selectOne(new OrderTourDetail(){{
                         setOrderId(baseOrder.getId());
                     }});
+
                     Long timeLag = otd.getStartTime() - System.currentTimeMillis();
 
+                    OrderItem adultItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_ADULT.getCode());
+                        setOrderId(baseOrder.getId());
+                    }});
+
+                    OrderItem childItem = orderItemBiz.selectOne(new OrderItem(){{
+                        setType(ItemTypeEnum.TOUR_CHILD.getCode());
+                        setOrderId(baseOrder.getId());
+                    }});
+
                     //判断是省内还是省外
                     String key = TOUR_IN_REFUND;
                     if(SYS_TRUE.equals(otd.getIsOutside())) {
                         key = TOUR_REFUND;
                     }
                     //退款流程
-                    orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ key);
+                    orderAccountBiz.rentRefundProcessCancel(hasUpdateOrder, adultItem.getRealAmount().add(childItem.getRealAmount()), timeLag, APP_ORDER+ "_"+ key, BigDecimal.ZERO, BigDecimal.ZERO);
 
                     //站点总人数减少
                     tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, (otd.getTotalNumber() * -1));

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java

@@ -10,6 +10,7 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.entity.OrderViolation;
+import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -61,6 +62,9 @@ public class RentDepositJobHandler extends IJobHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
@@ -120,7 +124,9 @@ public class RentDepositJobHandler extends IJobHandler {
                         refundAmont = orvd.getReturnPayResidue();
                         refundDesc += refundAmont.toString();
                     }
-                    orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
+                    OrderAccountDetail oad = new OrderAccountDetail();
+                    orderAccountBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT, oad);
+                    //orderRefundBiz.refundTrigger(baseOrder, orvd, BigDecimal.ZERO, orvd.getReturnPayResidue(), refundAmont, refundDesc, RefundStatusEnum.REFUND_DEPOSIT.getCode(), RefundTypeEnum.RESIDUE_DEPOSIT);
                     orderDepositRefundRecordBiz.completeRecordStatus(crosstown.getId(), DepositRefundStatus.VIOLATIONARRIVAL);
                     orderMsgBiz.handelMsgDeposit(orvd, baseOrder, userFeign.userDetailById(baseOrder.getUserId()).getData());
                 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java

+package com.xxfc.platform.order.mapper;
+
+import com.xxfc.platform.order.entity.OrderAccount;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 订单帐目
+ * 
+ * @author zhoujw
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+public interface OrderAccountMapper extends Mapper<OrderAccount> {
+	
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RefundMQHandler.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.order.mqhandler;
 
 import cn.hutool.json.JSONUtil;
 import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
 import com.xxfc.platform.order.biz.OrderRefundBiz;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,9 @@ public class RefundMQHandler {
     @Autowired
     OrderRefundBiz orderRefundBiz;
 
+    @Autowired
+    OrderAccountBiz orderAccountBiz;
+
     /**
      * 退款
      * @param
@@ -42,7 +46,7 @@ public class RefundMQHandler {
                     String msg = new String(message.getBody(), "UTF-8");
                     OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
 
-                    orderRefundBiz.refundPartDeposit(orderMQDTO);
+                    orderAccountBiz.refundPartDeposit(orderMQDTO);
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderAccountController.java

+package com.xxfc.platform.order.rest;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.order.biz.OrderAccountBiz;
+import com.xxfc.platform.order.entity.OrderAccount;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("orderAccount")
+public class OrderAccountController extends BaseController<OrderAccountBiz,OrderAccount> {
+
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java

@@ -72,43 +72,43 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
 
         switch (orderTypeEnum) {
             case RENT_VEHICLE:
-                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
-                        , refundDescBuilder);
-                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
-                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
-                //原退还押金
-                BigDecimal originalDeductAmount = BigDecimal.ZERO;
-                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
-                //判断是否使用免费天数，并且进行扣款
-                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
-                    refundDescBuilder = new StringBuilder("");
-                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
-                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
-                        setOrderId(orderPageVO.getId());
-                    }});
-                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
-                }
-                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
-                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
-
-                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
-                //退款金额 ：订单剩余款 + 押金剩余款
-                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
+//                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+//                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
+//                        , DictionaryKey.APP_ORDER+ "_"+ RENT_REFUND
+//                        , refundDescBuilder);
+//                OrderRentVehicleDetail orvd = orderPageVO.getOrderRentVehicleDetail();
+//                Long timeLag = orvd.getStartTime() - System.currentTimeMillis();
+//                //原退还押金
+//                BigDecimal originalDeductAmount = BigDecimal.ZERO;
+//                BigDecimal originalRefundAmount = BigDecimal.ZERO.add(orvd.getDeposit());
+//                //判断是否使用免费天数，并且进行扣款
+//                if(null != orvd.getFreeDays() && orvd.getFreeDays() > 0) {
+//                    refundDescBuilder = new StringBuilder("");
+//                    OrderItem orderItem = orderItemBiz.selectOne(new OrderItem(){{
+//                        setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
+//                        setOrderId(orderPageVO.getId());
+//                    }});
+//                    originalDeductAmount = orderItem.getUnitPrice().multiply(new BigDecimal(orvd.getFreeDays()+ ""));
+//                }
+//                BigDecimal residueAmount = orderRefundBiz.calculateRefund(originalDeductAmount, timeLag, APP_ORDER+ "_"+ RENT_REFUND, refundDescBuilder);
+//                residueAmount = residueAmount.setScale(2, RoundingMode.HALF_UP);
+//
+//                //押金剩余款 ：押金 - (原扣除款 - 剩余款)
+//                //退款金额 ：订单剩余款 + 押金剩余款
+//                orderRefundAmount = orderRefundAmount.add(originalRefundAmount.subtract(originalDeductAmount.subtract(residueAmount)));
 
                 break;
             case TOUR:
                 //判断是省内还是省外
-                String key = TOUR_IN_REFUND;
-                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-                    key = TOUR_REFUND;
-                }
-                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
-                        , DictionaryKey.APP_ORDER+ "_"+ key
-                        , refundDescBuilder);
-                break;
+//                String key = TOUR_IN_REFUND;
+//                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+//                    key = TOUR_REFUND;
+//                }
+//                orderRefundAmount = orderRefundBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+//                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
+//                        , DictionaryKey.APP_ORDER+ "_"+ key
+//                        , refundDescBuilder);
+//                break;
             default:
                 break;
         }