Merge branch 'master' into customer_service_Dwl

src/main/java/com/yaoyaozw/customer/service/impl/CustomerKeywordServiceImpl.java

@@ -148,7 +148,7 @@ public class CustomerKeywordServiceImpl extends ServiceImpl<CustomerKeywordMappe
         } else {
             this.updateById(entity);
         }
-        putMaterialToRedis(entity.getAppid(), null);
+        putMaterialToRedis(entity.getAppid());
         return new GenericsResult<>(String.valueOf(entity.getId()));
     }
 
@@ -197,7 +197,7 @@ public class CustomerKeywordServiceImpl extends ServiceImpl<CustomerKeywordMappe
         // 删除相关链接
         referralEntityService.remove(new QueryWrapper<ReferralEntity>().eq(ReferralEntity.COL_MATERIAL_GRAPHICS_ID, id));
         // 重置redis中的素材
-        putMaterialToRedis(entity.getAppid(), null);
+        putMaterialToRedis(entity.getAppid());
 
         return new BaseResult().success("删除");
     }
@@ -254,7 +254,7 @@ public class CustomerKeywordServiceImpl extends ServiceImpl<CustomerKeywordMappe
                 if (CollectionUtil.isNotEmpty(result.getMaterialList())) {
                     this.saveBatch(result.getMaterialList());
                     // 复用之后的结果存储到 redis
-                    putMaterialToRedis(targetAuth.getAppId(), result.getMaterialList());
+                    putMaterialToRedis(targetAuth.getAppId());
                 }
                 if (CollectionUtil.isNotEmpty(result.getReferralEntityList())) {
                     referralEntityService.saveBatch(result.getReferralEntityList());
@@ -382,16 +382,16 @@ public class CustomerKeywordServiceImpl extends ServiceImpl<CustomerKeywordMappe
         return null;
     }
 
-    private void putMaterialToRedis(String appid, List<CustomerKeyword> entityList) {
-        if (StringUtils.isNotEmpty(appid) && CollectionUtil.isEmpty(entityList)) {
+    private void putMaterialToRedis(String appid) {
+        if (StringUtils.isNotEmpty(appid)) {
             // 传参没传实体, 现查
-            entityList = this.list(new QueryWrapper<CustomerKeyword>().eq("appid", appid));
-        }
-        if (CollectionUtil.isNotEmpty(entityList)) {
-            String jsonStr = JSONUtil.toJsonStr(entityList);
-            redisTemplate.opsForHash().put(CustomerMaterialConstant.CUSTOMER_KEYWORD_REDIS_KEY, appid, jsonStr);
-        } else {
-            redisTemplate.opsForHash().delete(CustomerMaterialConstant.CUSTOMER_KEYWORD_REDIS_KEY, appid);
+            List<CustomerKeyword> entityList = this.list(new QueryWrapper<CustomerKeyword>().eq("appid", appid));
+            if (CollectionUtil.isNotEmpty(entityList)) {
+                String jsonStr = JSONUtil.toJsonStr(entityList);
+                redisTemplate.opsForHash().put(CustomerMaterialConstant.CUSTOMER_KEYWORD_REDIS_KEY, appid, jsonStr);
+            } else {
+                redisTemplate.opsForHash().delete(CustomerMaterialConstant.CUSTOMER_KEYWORD_REDIS_KEY, appid);
+            }
         }
     }