Browse Source

Merge branch 'dev_v1.3.4_20220902'

liujunchi 3 years ago
parent
commit
1f7c4dc20c

+ 5 - 0
cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -1312,6 +1312,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                                .multiply(coupon);
                                                .multiply(coupon);
             orderItem.setCouponAmount(couponAmount);
             orderItem.setCouponAmount(couponAmount);
         }
         }
+        BigDecimal reduce = orderItemList.stream()
+                                         .map(OmsOrderItem::getCouponAmount)
+                                         .reduce(BigDecimal.ZERO, BigDecimal::add);
+        OmsOrderItem omsOrderItem = orderItemList.get(0);
+        omsOrderItem.setCouponAmount(omsOrderItem.getCouponAmount().add(coupon.subtract(reduce)));
     }
     }
 
 
     /**
     /**