update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SellOrderServiceImpl.java

@@ -359,12 +359,11 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         }
         if (sellOrders.size() > 0) {
             //如果有优惠券金额
-            BigDecimal couponMarketAmount = musicRemitFee;
-            if (couponMarketAmount.compareTo(BigDecimal.ZERO) > 0) {
+            if (musicRemitFee.compareTo(BigDecimal.ZERO) > 0) {
                 BigDecimal reduce = sellOrders.stream().map(e -> e.getExpectAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
                 List<SellOrder> sellOrderList = sellOrders.stream().filter(e -> e.getExpectAmount().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
                 //可用优惠券金额
-                BigDecimal subCouponMarketAmount = couponMarketAmount;
+                BigDecimal subCouponMarketAmount = musicRemitFee;
                 for (int j = 0; j < sellOrderList.size(); j++) {
                     SellOrder sellOrder = sellOrderList.get(j);
                     //如果是最后一件商品
@@ -374,7 +373,7 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
                         //获取比例
                         BigDecimal ratioAmount = sellOrder.getExpectAmount().divide(reduce, 6, BigDecimal.ROUND_HALF_UP);
                         //获取分配的减免金额
-                        BigDecimal multiply = couponMarketAmount.multiply(ratioAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal multiply = musicRemitFee.multiply(ratioAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
                         subCouponMarketAmount = subCouponMarketAmount.subtract(multiply);
                         sellOrder.setCouponRemitAmount(multiply);
                     }