Merge remote-tracking branch 'origin/Payment-Configuration' into Payment-Configuration

fs-company/src/main/java/com/fs/company/controller/company/CompanyProfileController.java

@@ -151,6 +151,8 @@ public class CompanyProfileController extends BaseController
             String avatar = storage.uploadSuffix(file.getBytes(), ".jpg");
             if (userService.updateUserAvatar(loginUser.getUsername(), avatar)>0)
             {
+                CompanyUser companyUser = userService.selectUserByUserName(loginUser.getUsername());
+                openIMService.updateUserInfo(companyUser);
                 AjaxResult ajax = AjaxResult.success();
                 ajax.put("imgUrl", avatar);
                 // 更新缓存用户头像

fs-service/src/main/java/com/fs/im/service/impl/OpenIMServiceImpl.java

@@ -457,7 +457,7 @@ public class OpenIMServiceImpl implements OpenIMService {
             updateUserInfo.setUserID(user.getUserID());
             updateUserInfo.setNickname(companyUser.getNickName());
             //updateUserInfo.setFaceURL(Optional.ofNullable(user.getFaceURL()).orElse("http://company.muyi88.com/profile/avatar/2025/09/10/35ed3564-aad9-4580-a746-5da01e24d2ab.jpeg"));
-            updateUserInfo.setFaceURL("http://company.muyi88.com/prod-api/profile/avatar/2025/04/08/aa418999-6738-492d-9856-491916f714d9.jpeg");
+            updateUserInfo.setFaceURL(companyUser.getAvatar());
             updateUserInfo.setEx(Optional.ofNullable(user.getEx()).orElse(""));
 
             Map<String, Object> bodyMap = new HashMap<>();

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

@@ -464,7 +464,18 @@ public class AppLoginController extends AppBaseController{
         if (!redisCode.equals(code)) {
             return R.error("验证码错误");
         }
+
         updateExistingUserJpushId(user.get(0), map.get("jpushId"));
+        if (user.get(0).getUnionId()==null){
+            if (user.get(0).getPhone().length()<=11){
+                FsUser fsUser = new FsUser();
+                fsUser.setUserId(user.get(0).getUserId());
+                fsUser.setPhone(encryptPhone(phone));
+                userMapper.updateFsUser(fsUser);
+                logger.info("zyp \n【手机加密】：{}",encryptPhone(phone));
+            }
+            return R.ok().put("isNew",true).put("phone",encryptPhone(phone));
+        }
         return generateTokenAndReturn(user.get(0));
     }
 
@@ -692,6 +703,16 @@ public class AppLoginController extends AppBaseController{
         //当前手机号只绑定了单个微信，直接登录
         if (usersByPhone.size()==1){
             user = usersByPhone.get(0);
+            if (user.getUnionId()==null){
+                if (user.getPhone().length()<=11){
+                    FsUser fsUser = new FsUser();
+                    fsUser.setUserId(user.getUserId());
+                    fsUser.setPhone(encryptPhone(param.getPhone()));
+                    userMapper.updateFsUser(fsUser);
+                    logger.info("zyp \n【手机加密】：{}",encryptPhone(param.getPhone()));
+                }
+                return R.ok().put("isNew",true).put("phone",encryptPhone(param.getPhone()));
+            }
             // 校验用户是否存在及账号状态
             if (user == null) {
                 return R.error("账号不存在，请先注册账号");