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

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

@@ -122,7 +122,8 @@ public class OrderCalculateBiz {
             inProgressVO.setUsedFreeDaysAmount(orderItem.getUnitPrice().multiply(new BigDecimal(useDays+ "")));
 
             //返回剩余免费天数，返回优惠券，订单款
-            refundAmount = refundAmount.add(goodsRealAmount);
+            //修改bug，不需要提前加， 已在handleConsumeAmount方法中添加
+//            refundAmount = refundAmount.add(goodsRealAmount);
             inProgressVO.setBackFreeDays(backFreeDays);
 
             //返回优惠券
@@ -132,7 +133,10 @@ public class OrderCalculateBiz {
             }
 
             //设置消费金额 由于返回了优惠券，所以添加优惠券之前减免的金额
-            consumeAmount = consumeAmount.add(otherItemRealAmount).add(baseOrder.getCouponAmount());
+            consumeAmount = consumeAmount.add(otherItemRealAmount);
+                    //修改bug，消费金额不需要添加优惠券金额
+                    //.add(baseOrder.getCouponAmount());
+
             inProgressVO.setConsumeAmount(consumeAmount);
 
             refundAmount = handleConsumeAmount(oad, refundAmount, consumeAmount, goodsRealAmount, inProgressVO);