fix:换购积分抵扣规则，新增是否与促销和优惠券同享

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

@@ -9,6 +9,7 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.user.GetUserScoreUseDetailRequest;
 import cn.freemud.entities.dto.user.GetUserScoreUserDetailResponse;
 import cn.freemud.entities.vo.*;
+import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.service.IPromotionService;
 import cn.freemud.service.thirdparty.CustomScoreClient;
 import cn.freemud.utils.LogUtil;
@@ -74,10 +75,19 @@ public class CustomerScoreService implements IPromotionService {
             } else {
                 if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || (calculationDiscountResult != null && calculationDiscountResult.getTotalDiscountAmount().intValue() > 0)
                         || (calculationDiscountResult != null && !CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts()))) {
-                    //积分抵扣开关禁用
-                    customerScoreVo.setScoreReduceState(5);
-                    userScoreUseDetail.getResult().setScoreState(5);
-                    discountAmount = 0;
+                    int type81 = 0;
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()) {
+                        if (ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType())) {
+                            type81 = 1;
+                            break;
+                        }
+                    }
+                    //积分抵扣开关禁用 过滤换购
+                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))) {
+                        customerScoreVo.setScoreReduceState(5);
+                        userScoreUseDetail.getResult().setScoreState(5);
+                        discountAmount = 0;
+                    }
                 }
             }