fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -19,6 +19,7 @@ import com.fs.common.event.TemplateBean;
 import com.fs.common.event.TemplateEvent;
 import com.fs.common.event.TemplateListenEnum;
 import com.fs.common.exception.CustomException;
+import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.Company;
@@ -499,11 +500,22 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setStoreHouseCode("CK01");
             storeOrder.setCompanyId(param.getCompanyId());
             storeOrder.setCompanyUserId(param.getCompanyUserId());
+            //绑定销售
+            FsUser fsuser= userService.selectFsUserById(userId);
             if(param.getCompanyUserId()!=null){
+                if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&&fsuser.getCompanyUserId()!=param.getCompanyUserId()){
+                    CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
+                    return R.error(String.format("请联系%s销售进行购买商品！",companyUser.getNickName()));
+                }else {
+                    fsuser.setCompanyUserId(param.getCompanyUserId());
+                    userService.updateFsUser(fsuser);
+                }
                 CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
                 if(companyUser!=null){
                     storeOrder.setDeptId(companyUser.getDeptId());
                 }
+            }else {
+                storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
             }
             storeOrder.setUserId(userId);
             storeOrder.setOrderCode(orderSn);

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

@@ -4,20 +4,26 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.app.param.LoginMaWxParam;
 import com.fs.app.utils.JwtUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+
 import com.fs.common.utils.IpUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyUser;
-import com.fs.company.service.ICompanyDeptService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyUserService;
+
+import com.fs.his.domain.FsUserWx;
+import com.fs.his.service.IFsUserWxService;
 import com.fs.store.domain.FsUser;
 import com.fs.store.domain.FsUserCompanyUser;
 import com.fs.store.service.IFsUserCompanyUserService;
 import com.fs.store.service.IFsUserService;
+import com.fs.system.mapper.SysConfigMapper;
 import com.fs.wx.miniapp.config.WxMaConfiguration;
 import com.fs.wx.miniapp.config.WxMaProperties;
 import io.swagger.annotations.Api;
@@ -37,6 +43,9 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Date;
 import java.util.Objects;
 
+import static com.fs.common.utils.PhoneUtil.encryptPhone;
+
+
 @Api("微信小程序相关接口")
 @RestController
 @RequestMapping(value = "/app/wx/miniapp")
@@ -56,8 +65,6 @@ public class WxCompanyUserController extends AppBaseController {
     @Autowired
     private ICompanyUserService companyUserService;
 
-    @Autowired
-    private ICompanyDeptService companyDeptService;
 
     @Autowired
     private IFsUserService userService;
@@ -67,6 +74,12 @@ public class WxCompanyUserController extends AppBaseController {
     @Autowired
     private IFsUserCompanyUserService userCompanyUserService;
 
+    @Autowired
+    private SysConfigMapper sysConfigMapper;
+
+    @Autowired
+    private IFsUserWxService fsUserWxService;
+
     @ApiOperation("小程序-授权登录")
     @PostMapping("/loginByMa")
     public R login(@Validated @RequestBody LoginMaWxParam param) {
@@ -74,114 +87,187 @@ public class WxCompanyUserController extends AppBaseController {
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
         }
-//        if (param.getNickname().length()>100){
-//            return R.error("昵称不符合标准!");
+
+        // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
+        Company company = companyService.selectCompanyById(param.getCompanyId());
+        if (company==null || company.getStatus()==0){
+            return R.error("注册失败团队已停用，或不存在！");
+        }
+
+        // 根据销售后台设置的  是否需要单独注册会员 来判断是否需要设置销售的值
+        CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());;
+        if(companyUser == null || companyUser.getStatus().equals("1")){
+            return R.error("注册失败客服已停用，或不存在！");
+        }
+//        if (company.getCourseMiniAppId() == null) {
+//            return R.error("小程序参数错误!");
+//        }
+//        if (!param.getAppId().equals(company.getCourseMiniAppId())){
+//            return R.error("无权限，");
 //        }
-        //获取第二个小程序配置，序号从0开始
+
         final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info(session.getSessionKey());
             this.logger.info(session.getOpenid());
             this.logger.info(session.getUnionid());
-
             if (StringUtils.isEmpty(session.getOpenid())){
                 return R.error("登陆失败，openid未授权，请稍后再试!");
             }
 
             // 手机号信息
-            WxMaPhoneNumberInfo phoneNoInfo = new WxMaPhoneNumberInfo();
-            FsUser user = null;
+            WxMaPhoneNumberInfo phoneNoInfo = new WxMaPhoneNumberInfo();;
             if (param.getAuthType()==1){
                 phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
                 if (StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())){
                     return R.error("授权失败，请联系客服！");
                 }
-                user = userService.selectFsUserByPhone(phoneNoInfo.getPhoneNumber());
             }
 
-            // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
-            Company company = companyService.selectCompanyById(param.getCompanyId());
-            if (company==null || company.getStatus()==0){
-                return R.error("注册失败团队已停用，或不存在！");
-            }
+            FsUser user = getUserByAuthType(param, wxService, session, phoneNoInfo);
 
-            // 根据销售后台设置的  是否需要单独注册会员 来判断是否需要设置销售的值
-            CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());;
-            if(companyUser == null || companyUser.getStatus().equals("1")){
-                return R.error("注册失败客服已停用，或不存在！");
-            }
 
+            if (user!=null && user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())) {
+                return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
+
+            // 3. 处理用户注册或更新
             String ip = IpUtil.getRequestIp();
-            if (user == null) {
-                if(StringUtils.isNotEmpty(session.getUnionid())){
-                    user = userService.selectFsUserByUnionId(session.getUnionid());
-                } else {
-                    user = userService.selectFsUserByMaOpenId(session.getOpenid());
-                }
-                // 绑定关系默认状态
-                int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
-                if (user != null) {
-                    //修改
-                    FsUser userMap = new FsUser();
-                    userMap.setUserId(user.getUserId());
-                    userMap.setMaOpenId(session.getOpenid());
-                    userMap.setUnionId(session.getUnionid());
-                    userMap.setUpdateTime(new DateTime());
-//                    userMap.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
-//                    userMap.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
-                    userMap.setPhone(phoneNoInfo.getPhoneNumber());
-                    // 逻辑调整：如果会员已经绑定了销售，直接提示，不让注册-2025年6月16日14点53分
-                    FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
-                    if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
-                        return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
-                    }
-//                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
-//                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-//                        userMap.setCompanyId(param.getCompanyId());
-//                        userMap.setCompanyUserId(param.getCompanyUserId());
-//                    }
-                    userService.updateFsUser(userMap);
-                } else {
-                    //新增
-                    user = new FsUser();
-//                    user.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
-//                    user.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
-                    user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
-                    user.setMaOpenId(session.getOpenid());
-                    user.setUnionId(session.getUnionid());
-                    user.setCreateTime(new Date());
-                    user.setPhone(phoneNoInfo.getPhoneNumber());
-                    userService.insertFsUser(user);
-                    if(companyUser != null &&
-                            (companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
-                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-                        userCompanyUserService.bindRelationship(user.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
-                    }
-//                    redisCache.setCacheObject("");
-                    userService.insertFsUser(user);
-                }
-            } else {
-                FsUser userMap = new FsUser();
-                userMap.setUserId(user.getUserId());
-                userMap.setUpdateTime(new DateTime());
-                userMap.setPhone(phoneNoInfo.getPhoneNumber());
-                userMap.setLastIp(ip);
-                if (StringUtils.isNotEmpty(session.getUnionid())) {
-                    userMap.setUnionId(session.getUnionid());
-                }
-                userService.updateFsUser(userMap);
-            }
-            log.info("保存成功的用户信息user: {}, 用户id: {}", user, user.getUserId());
+            user = handleUserRegisterOrUpdate(user, param, session, phoneNoInfo, company, companyUser, ip);
+
+            // 4. 处理用户与小程序的绑定
+            handleFsUserWx(user, param, company, session);
+
+            log.info("保存成功的用户信息user: {}, 用户id: {},小程序AppId:{}", user, user.getUserId(), param.getAppId());
             String token = jwtUtils.generateToken(user.getUserId());
-            // 返回一个写死的数据到前端
-            return R.ok("登录成功").put("token", token).put("phoneNumber", phoneNoInfo.getPhoneNumber()).put("nickName", "微信用户").put("user", user);
+            // 返回TOKEN和user
+            return R.ok("登录成功").put("token", token).put("user", user);
         } catch (WxErrorException e) {
             this.logger.error(e.getMessage(), e);
             return R.error("授权失败," + e.getMessage());
         }
     }
 
+    /**
+     * 根据authType获取用户信息
+     */
+    private FsUser getUserByAuthType(LoginMaWxParam param, WxMaService wxService, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo) throws WxErrorException {
+        FsUser user = null;
+        if (param.getAuthType() == 1) {
+            user = userService.selectFsUserByPhone(encryptPhone(phoneNoInfo.getPhoneNumber()));
+        } else {
+            // unionid判定唯一
+            if (StringUtils.isNotEmpty(session.getUnionid())) {
+                user = userService.selectFsUserByUnionId(session.getUnionid());
+            }
+        }
+        return user;
+    }
+
+
+    /**
+     * 处理用户注册或更新
+     */
+    private FsUser handleUserRegisterOrUpdate(FsUser user, LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser, String ip) {
+        if (user == null) {
+            return createUser(param, session, phoneNoInfo, company, companyUser);
+        } else {
+            return updateUser(user, param, session, phoneNoInfo, company, companyUser);
+        }
+    }
+
+    /**
+     * 新增用户
+     */
+    private FsUser createUser(LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser) {
+        FsUser user = new FsUser();
+        user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+        user.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+        user.setCreateTime(new Date());
+        if (param.getAuthType() == 1 && phoneNoInfo != null) {
+            user.setPhone(phoneNoInfo.getPhoneNumber());
+        }
+        if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+                && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+            userCompanyUserService.bindRelationship(user.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
+        }
+        userService.insertFsUser(user);
+        return user;
+    }
+
+    /**
+     * 修改用户
+     */
+    private FsUser updateUser(FsUser user, LoginMaWxParam param, WxMaJscode2SessionResult session, WxMaPhoneNumberInfo phoneNoInfo, Company company, CompanyUser companyUser) {
+        FsUser userMap = new FsUser();
+        userMap.setUserId(user.getUserId());
+        userMap.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+        userMap.setUpdateTime(new DateTime());
+        if (param.getAuthType() == 1 && phoneNoInfo != null) {
+            userMap.setPhone(phoneNoInfo.getPhoneNumber());
+        }
+
+        FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(user.getUserId(), param.getProjectId());
+        if (Objects.nonNull(userCompanyUser) && !param.getCompanyUserId().equals(userCompanyUser.getCompanyUserId())){
+            return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
+        }
+
+        userService.updateFsUser(userMap);
+        return userMap;
+    }
+
+
+    /**
+     * 处理用户与小程序的绑定
+     */
+    private void handleFsUserWx(FsUser user, LoginMaWxParam param, Company company, WxMaJscode2SessionResult session) {
+        if (user == null) return;
+//        FsUserWx fsUserWx = fsUserWxService.selectByAppIdAndUserId(company.getCourseMiniAppId(), user.getUserId(), 1);
+//        if (fsUserWx == null) {
+//            fsUserWx = new FsUserWx();
+//            fsUserWx.setType(1);
+//            fsUserWx.setFsUserId(user.getUserId());
+//            fsUserWx.setCompanyId(param.getCompanyId());
+//            fsUserWx.setAppId(company.getCourseMiniAppId());
+//            fsUserWx.setOpenId(session.getOpenid());
+//            fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+//            fsUserWx.setCreateTime(new Date());
+//            fsUserWxService.save(fsUserWx);
+//        } else {
+//            fsUserWx.setFsUserId(user.getUserId());
+//            fsUserWx.setCompanyId(param.getCompanyId());
+//            fsUserWx.setAppId(company.getCourseMiniAppId());
+//            fsUserWx.setOpenId(session.getOpenid());
+//            fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+//            fsUserWx.setUpdateTime(new Date());
+//            fsUserWxService.updateById(fsUserWx);
+//        }
+        // 尝试更新
+        boolean updated = fsUserWxService.lambdaUpdate()
+                .eq(FsUserWx::getFsUserId, user.getUserId())
+                .eq(FsUserWx::getAppId, company.getCourseMiniAppId())
+                .eq(FsUserWx::getOpenId, session.getOpenid())
+                .set(FsUserWx::getCompanyId, param.getCompanyId())
+                .set(FsUserWx::getUnionId, session.getUnionid() == null ? "" : session.getUnionid())
+                .set(FsUserWx::getUpdateTime, new Date())
+                .update();
+
+        // 如果更新失败（记录不存在），则插入
+        if (!updated) {
+            FsUserWx fsUserWx = new FsUserWx();
+            fsUserWx.setType(1);
+            fsUserWx.setFsUserId(user.getUserId());
+            fsUserWx.setCompanyId(param.getCompanyId());
+            fsUserWx.setAppId(company.getCourseMiniAppId());
+            fsUserWx.setOpenId(session.getOpenid());
+            fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+            fsUserWx.setCreateTime(new Date());
+            fsUserWx.setUpdateTime(new Date());
+            fsUserWxService.save(fsUserWx);
+        }
+    }
+
+
 //    @Login(isMiniLogin = true)
 //    @ApiOperation("获取销售通过小程序登录后的用户信息")
 //    @GetMapping("/getMaUser")

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

@@ -0,0 +1,176 @@
+package com.fs.app.controller;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.hutool.core.date.DateTime;
+import com.fs.app.param.LoginMaWxParam;
+import com.fs.app.utils.JwtUtils;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.IpUtil;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyDeptService;
+import com.fs.company.service.ICompanyService;
+import com.fs.company.service.ICompanyUserService;
+import com.fs.store.domain.FsUser;
+import com.fs.store.service.IFsUserService;
+import com.fs.wx.miniapp.config.WxMaConfiguration;
+import com.fs.wx.miniapp.config.WxMaProperties;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.Date;
+
+@Api("微信小程序相关接口")
+@RestController
+@RequestMapping(value = "/app/wx/miniapp/m")
+@Slf4j
+public class WxCompanyUserControllerCopy extends AppBaseController {
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private WxMaProperties maProperties;
+
+    @Autowired
+    JwtUtils jwtUtils;
+
+    @Autowired
+    RedisCache redisCache;
+
+    @Autowired
+    private ICompanyUserService companyUserService;
+
+    @Autowired
+    private ICompanyDeptService companyDeptService;
+
+    @Autowired
+    private IFsUserService userService;
+
+    @Autowired
+    ICompanyService companyService;
+
+    @ApiOperation("小程序-授权登录")
+    @PostMapping("/loginByMa")
+    public R login(@RequestBody @Valid LoginMaWxParam param) {
+        log.info("=====================进入小程序授权登录, 入参: {}", param);
+        if (StringUtils.isBlank(param.getCode())) {
+            return R.error("code不存在");
+        }
+        //根据前端传的appId来切换小程序配置
+        final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
+        try {
+            WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
+            this.logger.info(session.getSessionKey());
+            this.logger.info(session.getOpenid());
+            this.logger.info(session.getUnionid());
+
+            if (StringUtils.isEmpty(session.getOpenid())){
+                return R.error("登陆失败，openid未授权，请稍后再试!");
+            }
+
+            // 手机号信息
+            WxMaPhoneNumberInfo phoneNoInfo = new WxMaPhoneNumberInfo();
+            FsUser user = null;
+            if (param.getAuthType()==1){
+                phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
+                if (StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())){
+                    return R.error("授权失败，请联系客服！");
+                }
+                user = userService.selectFsUserByPhone(phoneNoInfo.getPhoneNumber());
+            }
+
+            // 特殊（需求设计：需要根据公司是否开启黑名单来设置会员初始化的状态）
+            Company company = companyService.selectCompanyById(param.getCompanyId());
+            if (company==null || company.getStatus()==0){
+                return R.error("注册失败团队已停用，或不存在！");
+            }
+
+
+
+            // 根据销售后台设置的  是否需要单独注册会员 来判断是否需要设置销售的值
+            CompanyUser companyUser = companyUserService.selectCompanyUserById(param.getCompanyUserId());;
+            if(companyUser == null || companyUser.getStatus().equals("1")){
+                return R.error("注册失败客服已停用，或不存在！");
+            }
+
+            String ip = IpUtil.getRequestIp();
+            if (user == null) {
+                if(StringUtils.isNotEmpty(session.getUnionid())){
+                    user = userService.selectFsUserByUnionId(session.getUnionid());
+                } else {
+                    user = userService.selectFsUserByMaOpenId(session.getOpenid());
+                }
+                if (user != null) {
+                    //修改
+                    FsUser userMap = new FsUser();
+                    userMap.setUserId(user.getUserId());
+                    userMap.setMaOpenId(session.getOpenid());
+                    userMap.setUnionId(session.getUnionid());
+                    userMap.setUpdateTime(new DateTime());
+//                    userMap.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
+//                    userMap.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
+                    userMap.setPhone(phoneNoInfo.getPhoneNumber());
+                    // 逻辑调整：如果会员已经绑定了销售，直接提示，不让注册-2025年6月16日14点53分
+                    if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
+                        return R.error(500, "该用户("+user.getUserId() + ")已成为其他销售会员");
+                    }
+//                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+//                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+//                        userMap.setCompanyId(param.getCompanyId());
+//                        userMap.setCompanyUserId(param.getCompanyUserId());
+//                    }
+                    userService.updateFsUser(userMap);
+                } else {
+                    //新增
+                    user = new FsUser();
+//                    user.setNickname(param.getNickname() != null ? param.getNickname() : "微信用户");
+//                    user.setAvatar(param.getAvatar() != null ? param.getAvatar() : null);
+                    user.setStatus((company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1);
+                    user.setMaOpenId(session.getOpenid());
+                    user.setUnionId(session.getUnionid());
+                    user.setCreateTime(new Date());
+                    user.setPhone(phoneNoInfo.getPhoneNumber());
+                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+                        user.setCompanyId(param.getCompanyId());
+                        user.setCompanyUserId(param.getCompanyUserId());
+                    }
+//                    redisCache.setCacheObject("");
+                    userService.insertFsUser(user);
+                }
+            } else {
+                FsUser userMap = new FsUser();
+                userMap.setUserId(user.getUserId());
+                userMap.setUpdateTime(new DateTime());
+                userMap.setPhone(phoneNoInfo.getPhoneNumber());
+                userMap.setLastIp(ip);
+                if (StringUtils.isNotEmpty(session.getUnionid())) {
+                    userMap.setUnionId(session.getUnionid());
+                }
+                userService.updateFsUser(userMap);
+            }
+            log.info("保存成功的用户信息user: {}, 用户id: {}", user, user.getUserId());
+            String token = jwtUtils.generateToken(user.getUserId());
+            // 返回一个写死的数据到前端
+            return R.ok("登录成功").put("token", token).put("phoneNumber", phoneNoInfo.getPhoneNumber()).put("nickName", "微信用户").put("user", user);
+        } catch (WxErrorException e) {
+            this.logger.error(e.getMessage(), e);
+            return R.error("授权失败," + e.getMessage());
+        }
+    }
+
+
+}