zyp

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -2089,8 +2089,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                         String cacheKey = buildXsyLinkCacheKey(param.getCorpId(),param.getCourseId(),param.getVideoId(),companyUserId,companyId);
                         log.info("跟踪前缀redisKey:{}",cacheKey);
                         //从redis中查询收否已经存在追踪链接
-                        String xsyTrackUrl = redisCache.getCacheObject(cacheKey);
-                        if (StringUtils.isBlank(xsyTrackUrl)){
+//                        String xsyTrackUrl = redisCache.getCacheObject(cacheKey);
+//                        if (StringUtils.isBlank(xsyTrackUrl)){
                             // 失败不影响主流程
                             try {
                                 if (StringUtils.isEmpty(link)) {
@@ -2142,6 +2142,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                         throw new RuntimeException("生成追踪链接失败，msg=" + response.getMsg());
                                     }
 
+                                    log.info("销售易返回：{}",response);
+
                                     if (response.getData() == null
                                             || response.getData().getTrackedMaterials() == null
                                             || response.getData().getTrackedMaterials().isEmpty()
@@ -2156,8 +2158,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                     st.setLinkUrl(xsyRedirectUrl);
 
                                     //将追踪链接存入redis
-                                    redisCache.setCacheObject(cacheKey, xsyRedirectUrl, 10, TimeUnit.DAYS);
-                                    log.info("销售易追踪链接写入缓存成功，cacheKey={}, xsyRedirectUrl={}", cacheKey, xsyRedirectUrl);
+//                                    redisCache.setCacheObject(cacheKey, xsyRedirectUrl, 10, TimeUnit.DAYS);
+//                                    log.info("销售易追踪链接写入缓存成功，cacheKey={}, xsyRedirectUrl={}", cacheKey, xsyRedirectUrl);
 
                                     log.info("销售易素材创建并生成追踪链接成功。sopId={}, userId={}, externalId={}, materialId={}, redirectUrl={}",
                                             item.getSopId(), item.getFsUserId(), item.getExternalId(),
@@ -2173,10 +2175,10 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                                     st.setXsyLinkUrl(link);
                                 }
                             }
-                        }
+//                        }
 
-                        st.setXsyLinkUrl(xsyTrackUrl);
-                        st.setLinkUrl(xsyTrackUrl);
+//                        st.setXsyLinkUrl(xsyTrackUrl);
+//                        st.setLinkUrl(xsyTrackUrl);
 
 
                         if (StringUtils.isNotEmpty(link)) {

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -440,10 +440,10 @@ public class AppLoginController extends AppBaseController{
             return R.error("验证码错误");
         }
         updateExistingUserJpushId(user.get(0), map.get("jpushId"));
-        
+
         // 更新登录设备信息
         updateLoginDevice(user.get(0).getUserId(), map.get("loginDevice"), map.get("source"));
-        
+
         return generateTokenAndReturn(user.get(0));
     }
 
@@ -708,10 +708,10 @@ public class AppLoginController extends AppBaseController{
             if (!Md5Utils.hash(param.getPassword()).equals(user.getPassword())) {
                 return R.error("密码不正确");
             }
-            
+
             // 更新登录设备信息
             updateLoginDevice(user.getUserId(), param.getLoginDevice(), param.getSource());
-            
+
             //登录成功以后写入达人表
             //fsUserTalentService.addFsUserTalent(fsUser.getUserId());
             return generateTokenAndReturn(user);
@@ -845,10 +845,10 @@ public class AppLoginController extends AppBaseController{
         }else {
             return R.ok().put("users",usersByPhone);
         }
-        
+
         // 更新登录设备信息
         updateLoginDevice(user.getUserId(), param.getLoginDevice(), param.getSource());
-        
+
         return generateTokenAndReturn(user);
     }
 
@@ -861,10 +861,10 @@ public class AppLoginController extends AppBaseController{
         if (StringUtils.isNotEmpty(param.getJpushId())){
             updateExistingUserJpushId(user, param.getJpushId());
         }
-        
+
         // 更新登录设备信息
         updateLoginDevice(user.getUserId(), param.getLoginDevice(), param.getSource());
-        
+
         return generateTokenAndReturn(user);
     }
 
@@ -1009,7 +1009,7 @@ public class AppLoginController extends AppBaseController{
                 return R.error("绑定openId失败");
             }
         }
-        String appid = "wx6f25bbf90d1b13ce";
+        String appid = "wx425f08acd6f49f30";
         FsUserWx userWx = fsUserWxMapper.selectByAppidAndUserId(appid, fsUser.getUserId());
         if(userWx == null){
             FsUserWx userWx1 = new FsUserWx();