修改getTokenByOpenId方法

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -100,17 +100,19 @@ public class AppUserServiceImpl implements AppUserService {
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMpToken(EpdcAppUserTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMpUser(formDto.getWxCode()).getOpenId());
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
     }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> getMaToken(EpdcAppUserMaTokenFormDTO formDto) {
-        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()).getOpenid());
+        return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()));
     }
 
     @Override
     public Result<EpdcAppAuthorizationDTO> checkRegister(EpdcCheckRegisterFormDTO formDto) {
-        return this.getTokenByOpenId(formDto.getOpenId());
+        WxMaJscode2SessionResult wxMaJscode2SessionResult=new WxMaJscode2SessionResult();
+        wxMaJscode2SessionResult.setOpenid(formDto.getOpenId());
+        return this.getTokenByOpenId(wxMaJscode2SessionResult);
     }
 
     @Override
@@ -187,15 +189,16 @@ public class AppUserServiceImpl implements AppUserService {
     /**
      * 根据openId登录
      *
-     * @param openId
+     * @param wxMaJscode2SessionResult
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/20 18:46
      */
-    private Result<EpdcAppAuthorizationDTO> getTokenByOpenId(String openId) {
+    private Result<EpdcAppAuthorizationDTO> getTokenByOpenId(WxMaJscode2SessionResult wxMaJscode2SessionResult) {
         // 查询当前微信是否已注册用户
         EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO();
-        formDTO.setOpenId(openId);
+        formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
+        formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid());
         Result<UserDTO> userInfoResult = userFeignClient.queryUserDto(formDTO);
         if (!userInfoResult.success()) {
             return new Result().error(userInfoResult.getMsg());