Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享'

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -52,7 +52,8 @@ public enum ActivityTypeEnum {
     TYPE_200(200, "X元Y件"),
     TYPE_PACKAGE(900, "包装费"),
     TYPE_DELIVERY(901, "配送费"),
-    TYPE_320(320,"会员价商品优惠");
+    TYPE_320(320, "会员价商品优惠"),
+    TYPE_221(221, "集点");
 
     private Integer code;
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java

@@ -76,6 +76,7 @@ public class CustomerScoreService implements IPromotionService {
             } else {
                 if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)
                         || (calculationDiscountResult != null && !CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()))) {
+                    //是否有换购
                     int type81 = 0;
                     for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
                         if (ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType())) {
@@ -83,9 +84,25 @@ public class CustomerScoreService implements IPromotionService {
                             break;
                         }
                     }
-                    //积分抵扣开关禁用 过滤换购
-                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
-                            || (type81 == 1 && calculationDiscountResult.getDiscounts().size() > 1)) {
+                    //集点
+                    long discountCount = calculationDiscountResult.getDiscounts().stream().filter(discount -> !ActivityTypeEnum.TYPE_221.getCode().equals(discount.getType())).count();
+                    /*
+                    int discountCount = calculationDiscountResult.getDiscounts().size();
+                    int type211 = 0;
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
+                        if (ActivityTypeEnum.TYPE_221.getCode().equals(discount.getType())) {
+                            type211 += 1;
+                            break;
+                        }
+                    }
+                    discountCount = discountCount - type211;
+                     */
+                    //积分抵扣开关禁用 有换购活动 且选中了换购商品
+                    // - 有换购且选中了换购商品
+                    // - 有换购且没有选中换购商品 且除集点以外还有其他促销
+                    if ((type81 == 0 && discountCount >= 1)
+                            || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
+                            || (type81 == 1 && discountCount > 1)) {
                         customerScoreVo.setScoreReduceState(5);
                         userScoreUseDetail.getResult().setScoreState(5);
                         discountAmount = 0;