Merge remote-tracking branch 'origin/dev' into dev

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

@@ -62,13 +62,11 @@ public class OrderCalculateBiz {
         BigDecimal refundAmount = BigDecimal.ZERO;
         BigDecimal consumeAmount = BigDecimal.ZERO;
         //其他消费金额
-        BigDecimal otherItemRealAmount = baseOrder.getGoodsAmount().subtract(orderItem.getRealAmount());
+        BigDecimal otherItemRealAmount = baseOrder.getGoodsAmount().subtract(orderItem.getRealAmount().add(orderItem.getCouponAmount()));
 
         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;
@@ -78,6 +76,10 @@ public class OrderCalculateBiz {
         Integer residueDays = orderItem.getTotalNum() - useDays;
         //过了出发时间取消订单 ，优先使用免费天数
         if(backFreeDays <= 0) {
+            //设置免费天数
+            inProgressVO.setUsedfreeDays(freeDays);
+            inProgressVO.setUsedFreeDaysAmount(orderItem.getUnitPrice().multiply(new BigDecimal(freeDays+ "")));
+
             //消费天数
             Integer consumeDays = useDays - freeDays;
             //如果使用天数 大于 总天数
@@ -126,6 +128,10 @@ public class OrderCalculateBiz {
                 inProgressVO.setExtraAmount(consumeAmount.subtract(baseOrder.getGoodsAmount()));
             }
         }else {
+            //设置免费天数
+            inProgressVO.setUsedfreeDays(useDays);
+            inProgressVO.setUsedFreeDaysAmount(orderItem.getUnitPrice().multiply(new BigDecimal(useDays+ "")));
+
             //返回剩余免费天数，返回优惠券，订单款
             refundAmount = refundAmount.add(baseOrder.getGoodsAmount());
             inProgressVO.setBackFreeDays(backFreeDays);