Merge branch 'feature/1.9.9_购物车校验' into develop

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

@@ -40,7 +40,7 @@ public class CustomerScoreService implements IPromotionService {
 
     @Override
     public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
-        if (shoppingCartInfoRequestVo == null || ObjectUtils.notEqual(1, shoppingCartInfoRequestVo.getFlag()) || shoppingCartInfoRequestVo.getUseCustomerScore() == null || shoppingCartInfoRequestVo.getUseCustomerScore() == null || shoppingCartInfoRequestVo.getUseCustomerScore().equals(CustomerScoreConstant.NO_DISPLAY.getValue())) {
+        if (shoppingCartInfoRequestVo == null || shoppingCartInfoRequestVo.getUseCustomerScore() == null || shoppingCartInfoRequestVo.getUseCustomerScore() == null || shoppingCartInfoRequestVo.getUseCustomerScore().equals(CustomerScoreConstant.NO_DISPLAY.getValue())) {
             return;
         }
         GetUserScoreUseDetailRequest request = new GetUserScoreUseDetailRequest();