Merge branches 'feature/20211220_购物车活动互斥提示_wuping' and 'qa' of…

Merge branches 'feature/20211220_购物车活动互斥提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -3436,7 +3436,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String redisKey = RedisUtil.activityMutexKey + partnerId + "_" + appid;
         //购物车内部缓存
         String value = redisCache.hashGet(redisKey, "activityMutexType");
-        if (StringUtils.isNotBlank(value)) {
+        if (StringUtils.isBlank(value)) {
             return;
         }
         ActivityMutexConfig config =  JSONObject.parseObject(value,ActivityMutexConfig.class);

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

@@ -798,7 +798,7 @@ public class CalculationCommonService {
         String redisKey = RedisUtil.activityMutexKey + partnerId + "_" + appid;
         //购物车内部缓存
         String value = redisCache.hashGet(redisKey, "activityMutexType");
-        if (StringUtils.isNotBlank(value)) {
+        if (StringUtils.isBlank(value)) {
             return;
         }
         ActivityMutexConfig config =  JSONObject.parseObject(value,ActivityMutexConfig.class);