Skip to content

G
gogirl-miniapp-backend
Commit 577dee1d by huluobin
Options

折扣券注释

parent 6f2125d2
Showing with 13 additions and 13 deletions
src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java
...@@ -425,9 +425,9 @@ public class MarketServiceImpl implements MarketService { ...@@ -425,9 +425,9 @@ public class MarketServiceImpl implements MarketService {
if (orderServe != null) { if (orderServe != null) {
BigDecimal discountAmount = couponCustomerRelevance.getDiscountAmount(); BigDecimal discountAmount = couponCustomerRelevance.getDiscountAmount();
// if (couponCustomerRelevance.getType() == 5) { if (couponCustomerRelevance.getType() == 5) {
// discountAmount = orderServe.getPrice().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent())); discountAmount = orderServe.getPrice().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
// } }
BigDecimal actualDiscountAmount = orderServe.getPayPrice().min(discountAmount); BigDecimal actualDiscountAmount = orderServe.getPayPrice().min(discountAmount);
//新增外部券抵扣情况记录 //新增外部券抵扣情况记录
...@@ -580,16 +580,16 @@ public class MarketServiceImpl implements MarketService { ...@@ -580,16 +580,16 @@ public class MarketServiceImpl implements MarketService {
.collect(Collectors.toList()); .collect(Collectors.toList());
normalInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer); normalInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
//
// //6、折扣内部券 //6、折扣内部券
// List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
// .stream() .stream()
// //不是免单券 //不是免单券
// .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId())) .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
// //是折扣券 //是折扣券
// .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT)) .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
// .collect(Collectors.toList()); .collect(Collectors.toList());
// discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer); discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
} }
orderManageMapper.updateById(orderManage); orderManageMapper.updateById(orderManage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment