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

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/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 Integer 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 {
+    String name;
+    Integer type;
+    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 java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderAccountDetail {
+    BigDecimal orderAmount;
+    BigDecimal depositAmount;
+    List<OrderAccountDeduction> deductions;
+}

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 refundAmount = BigDecimal.ZERO;
+
     /**
      * 返还的优惠券
      */

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

+package com.xxfc.platform.order.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.xxfc.platform.order.entity.OrderAccount;
+import com.xxfc.platform.order.mapper.OrderAccountMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 订单帐目
+ *
+ * @author zhoujw
+ * @email 18178966185@163.com
+ * @date 2019-09-09 15:51:16
+ */
+@Service
+public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
+
+}
\ No newline at end of file

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

@@ -224,10 +224,10 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
     /**
      * 退款子流程
      * @param baseOrder
-     * @param refundDesc
-     * @param refundAmount
-     * @param refundType
-     * @param refundStatus
+     * @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;

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

@@ -72,8 +72,14 @@ public class OrderCalculateBiz {
     OrderItemBiz orderItemBiz;
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, OrderItem orderItem, Integer freeDays, Integer useDays) {
+        BigDecimal refundAmount = BigDecimal.ZERO;
+        InProgressVO inProgressVO = new InProgressVO();
         //计算：剩余免费天数
         Integer backFreeDays = freeDays - useDays;
+        //待返还的免费天数
+        List<String> backCouponNos = Lists.newArrayList();
+        //剩余天数
+        Integer residueDays = orderItem.getTotalNum() - useDays;
         //过了出发时间取消订单 ，优先使用免费天数
         if(backFreeDays <= 0) {
             //大于总天数 只返回押金
@@ -86,7 +92,6 @@ public class OrderCalculateBiz {
                 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 +102,39 @@ 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()));
+                }else {
+                    //否则，设置返回钱
+                    refundAmount = refundAmount.add(orderItem.getRealAmount().subtract(consumeAmount));
+                }
             }
         }else {
             //返回剩余免费天数，返回优惠券，订单款
+            refundAmount = refundAmount.add(orderItem.getRealAmount());
+            inProgressVO.setBackFreeDays(backFreeDays);
 
+        }
 
+        inProgressVO.setRefundAmount(refundAmount);
+        inProgressVO.setBackCoupons(backCouponNos);
+
+        //计算违约金
+            //residueDays * 身份价格
+        if(residueDays > 0) {
+            if(residueDays > 2) {
+                residueDays = 2;
+            }
+            inProgressVO.setViolateAmount(orderItem.getUnitPrice().multiply(new BigDecimal((residueDays + ""))));
         }
 
-        return new InProgressVO();
+        return inProgressVO;
     }
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {

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

@@ -138,7 +138,9 @@ public class OrderCancelBiz {
                         //计算：使用天数 当前时间 - 开始时间的0时0分0秒
                         Long useTimeLag = System.currentTimeMillis() - orvd.getStartTime();
                         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 inProgressVO = orderCalculateBiz.inProgressCalculate(baseOrder, orderItem, freeDays, useDays);
+
+                        //结合
 
                     }else {
                         //没到出车时间
@@ -154,8 +156,6 @@ public class OrderCancelBiz {
                         }
                     }
 
-
-
                     //退款流程
                         //退订单款
                     orderRefundBiz.rentRefundProcess(hasUpdateOrder, timeLag, APP_ORDER+ "_"+ RENT_REFUND);

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/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