Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/task/FsCompanyTask.java

@@ -24,6 +24,7 @@ public class FsCompanyTask {
     @Autowired
     private StringRedisTemplate redisTemplate;
     private static final String WX_URL_REDIS_PREFIX = "wx:link:";
+    private static final String WX_URL_REDIS_PREFIX_MEMBER = "wx:member:link:";
 
     public void refreshCompanyMoney() {
         LocalDateTime now = LocalDateTime.now();
@@ -47,10 +48,15 @@ public class FsCompanyTask {
      */
     public void clearWxUrlCache() {
         Set<String> keys = redisTemplate.keys(WX_URL_REDIS_PREFIX + "*");
+        Set<String> memberKeys = redisTemplate.keys(WX_URL_REDIS_PREFIX_MEMBER + "*");
         if (StringUtils.isNotEmpty(keys)) {
             assert keys != null;
             redisTemplate.delete(keys);
         }
+        if (StringUtils.isNotEmpty(memberKeys)) {
+            assert memberKeys != null;
+            redisTemplate.delete(memberKeys);
+        }
     }
 
 }

fs-service/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -134,9 +134,9 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
 
     private volatile Integer version = 0;
 
-    private static final String WX_URL_REDIS_PREFIX = "wx:link:";
+    private static final String WX_URL_REDIS_PREFIX = "wx:link";
 
-    private static final String WX_URL_REDIS_PREFIX_MEMBER = "wx:member:link:";
+    private static final String WX_URL_REDIS_PREFIX_MEMBER = "wx:member:link";
 
 
     /**
@@ -789,12 +789,12 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
              key = "becomeVip=";
             linkStrJson = linkStr.substring(linkStr.indexOf(key) + key.length());
             json = JSON.parseObject(linkStrJson);
-            wxAppLinkKey = String.format("%s%s%s%s%s",WX_URL_REDIS_PREFIX_MEMBER,json.get("companyId"),json.get("companyUserId"),json.get("projectId"),appId);
+            wxAppLinkKey = String.format("%s:%s:%s:%s:%s",WX_URL_REDIS_PREFIX_MEMBER,json.get("companyId"),json.get("companyUserId"),json.get("projectId"),appId);
         }else {
              key = "course=";
             linkStrJson = linkStr.substring(linkStr.indexOf(key) + key.length());
             json = JSON.parseObject(linkStrJson);
-            wxAppLinkKey = String.format("%s%s%s%s%s%s%s",WX_URL_REDIS_PREFIX,json.get("companyId"),json.get("companyUserId"),json.get("projectId"),json.get("courseId"),json.get("videoId"),appId);
+            wxAppLinkKey = String.format("%s:%s:%s:%s:%s:%s:%s",WX_URL_REDIS_PREFIX,json.get("companyId"),json.get("companyUserId"),json.get("projectId"),json.get("courseId"),json.get("videoId"),appId);
         }
 
         String linkCache = redisCache.getCacheObject(wxAppLinkKey);