登录接口修改

xpgx-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -93,6 +93,9 @@ public class UserInfoController extends BaseController {
         UserInfo dbUserInfo = userInfoService.getById(id);
         dbUserInfo.setNickName(nickName);
         dbUserInfo.setPhone(phone);
+        if (!StringUtils.isEmpty(phone)) {
+            dbUserInfo.setPhone(phone);
+        }
         if (!StringUtils.isEmpty(headImage)) {
             dbUserInfo.setHeadImage(headImage);
         }

xpgx-admin/src/main/java/com/miaxis/system/controller/system/SysLoginController.java

@@ -23,6 +23,7 @@ import com.miaxis.system.dto.system.AppleTokenDTO;
 import com.miaxis.system.dto.system.TokenDTO;
 import com.miaxis.system.dto.system.UserInfoDTO;
 import com.miaxis.system.service.ISysMenuService;
+import com.miaxis.system.service.ISysUserService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.service.IWxService;
 import io.swagger.annotations.Api;
@@ -73,7 +74,6 @@ public class SysLoginController
     @Autowired
     private IUserInfoService userInfoService;
 
-
     private static Logger logger = LoggerFactory.getLogger(SysLoginController.class);
 
     @Value("${gzh.appId}")
@@ -182,8 +182,7 @@ public class SysLoginController
             ServletUtils.getRequest().setAttribute("pUnionId",pUnionId);
             String token = loginService.login(wxUserInfo.getUnionid(),null, StudentLoginTypeEnum.AUTHORIZATION_XCX_LOGIN.getCode());
 
-            UserInfo student = SecurityUtils.getLoginUser().getStudent();
-            UserInfo dbUserInfo = userInfoService.getById(student.getId());
+            UserInfo dbUserInfo = userInfoService.getStudentByXcxOpenId(wxUserInfo.getOpenid());
             wxUserInfo.setNickname(dbUserInfo.getNickName());
             wxUserInfo.setOpenid(dbUserInfo.getXcxOpenid());
             wxUserInfo.setHeadimgurl(dbUserInfo.getHeadImage());

xpgx-service/src/main/java/com/miaxis/user/mapper/UserInfoMapper.java

@@ -1,6 +1,7 @@
 package com.miaxis.user.mapper;
 
 import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.common.core.domain.entity.UserInfo;
 import org.apache.ibatis.annotations.Param;
@@ -20,5 +21,8 @@ public interface UserInfoMapper extends BaseMapper<UserInfo> {
      */
     public List<UserInfo> selectUserInfoList(UserInfo userInfo);
 
-    void addProfitPrice(@Param("id") Long id, @Param("fencheng")Integer fencheng);
+    void addProfitPrice(@Param("id") Long id, @Param("fencheng") Integer fencheng);
+
+    UserInfo getStudentByXcxOpenId(String openId);
+
 }

xpgx-service/src/main/java/com/miaxis/user/service/IUserInfoService.java

@@ -21,4 +21,6 @@ public interface IUserInfoService extends IService<UserInfo>{
     public List<UserInfo> selectUserInfoList(UserInfo userInfo);
 
     void addProfitPrice(Long id, Integer zhuboFencheng);
+
+    UserInfo getStudentByXcxOpenId(String openId);
 }

xpgx-service/src/main/java/com/miaxis/user/service/impl/UserInfoServiceImpl.java

@@ -39,4 +39,11 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> i
     public void addProfitPrice(Long id, Integer fencheng) {
         userInfoMapper.addProfitPrice(id,fencheng);
     }
+
+
+    @Override
+    public UserInfo getStudentByXcxOpenId(String openId) {
+        return userInfoMapper.getStudentByXcxOpenId(openId);
+    }
+
 }

xpgx-service/src/main/resources/mapper/user/UserInfoMapper.xml

@@ -33,12 +33,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unionId != null  and unionId != ''"> and union_id = #{unionId}</if>
         </where>
     </select>
+
+    <select id="getStudentByXcxOpenId" parameterType="String" resultType="com.miaxis.common.core.domain.entity.UserInfo">
+        select * from user_info
+        where xcx_openid = #{openid}
+    </select>
+
+
     <update id="addProfitPrice">
         update user_info set profit_price =profit_price + #{fencheng}
         where id = #{id}
 
-
-
     </update>