折扣券注释

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -425,9 +425,9 @@ public class MarketServiceImpl implements MarketService {
 
                         if (orderServe != null) {
                             BigDecimal discountAmount = couponCustomerRelevance.getDiscountAmount();
-//                            if (couponCustomerRelevance.getType() == 5) {
-//                                discountAmount = orderServe.getPrice().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
-//                            }
+                            if (couponCustomerRelevance.getType() == 5) {
+                                discountAmount = orderServe.getPrice().multiply(BigDecimal.ONE.subtract(couponCustomerRelevance.getDiscountPercent()));
+                            }
                             BigDecimal actualDiscountAmount = orderServe.getPayPrice().min(discountAmount);
 
                             //新增外部券抵扣情况记录
@@ -580,16 +580,16 @@ public class MarketServiceImpl implements MarketService {
                     .collect(Collectors.toList());
             normalInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
 
-//
-//            //6、折扣内部券
-//            List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
-//                    .stream()
-//                    //不是免单券
-//                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
-//                    //是折扣券
-//                    .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
-//                    .collect(Collectors.toList());
-//            discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
+
+            //6、折扣内部券
+            List<CouponCustomerRelevance> discountInnerCouponCustomerRelevanceServiceList = innerCouponCustomerRelevanceServiceList
+                    .stream()
+                    //不是免单券
+                    .filter(couponCustomerRelevance -> !discountConfigListCouponId.contains(couponCustomerRelevance.getCouponId()))
+                    //是折扣券
+                    .filter(couponCustomerRelevance -> couponCustomerRelevance.getType().equals(CouponCustomerRelevance.TYPE_DISCOUNT))
+                    .collect(Collectors.toList());
+            discountInnerCouponCustomerRelevanceServiceList.forEach(couponCustomerRelevanceConsumer);
         }
 
         orderManageMapper.updateById(orderManage);