瀏覽代碼

feat:鸿森堂-app手动发课、微信登录不强制绑定手机号

caoliqin 6 天之前
父節點
當前提交
198fea27e0

+ 1 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1748,7 +1748,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
 
         // 判断来源是否是app,如是app,则发放积分奖励
         int sourceApp = 3;
-        if (sourceApp == param.getSource() && !CloudHostUtils.hasCloudHostName("中康")) {
+        if (sourceApp == param.getSource() && !CloudHostUtils.hasCloudHostName("中康", "鸿森堂")) {
             return sendIntegralReward(param, user, log, config);
         }
 

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

@@ -312,9 +312,11 @@ public class AppLoginController extends AppBaseController{
                 String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
                 user.setLastIp(ipAddr);
                 userService.insertFsUser(user);
-                map.put("isNew", true);
-                map.put("unionid",unionid);
-                return R.ok(map);
+                if(!CloudHostUtils.hasCloudHostName("鸿森堂")){
+                    map.put("isNew", true);
+                    map.put("unionid",unionid);
+                    return R.ok(map);
+                }
             } else {
                 // 老用户 - 检查并添加appId(不重复添加)
                 String updatedAppId = addAppIdIfNotExists(user.getAppId(), appId);
@@ -332,9 +334,11 @@ public class AppLoginController extends AppBaseController{
                     updateExistingUserJpushId(user, param.getJpushId());
                 }
                 if (StringUtils.isEmpty(user.getPhone())) {
-                    map.put("isNew", true);
-                    map.put("unionid",user.getUnionId());
-                    return R.ok(map);
+                    if(!CloudHostUtils.hasCloudHostName("鸿森堂")) {
+                        map.put("isNew", true);
+                        map.put("unionid", user.getUnionId());
+                        return R.ok(map);
+                    }
                 }
             }