微信登录修改

server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

@@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Api(description = "登录资源")
@@ -121,8 +122,10 @@ public class LoginController extends AccountBaseController {
     public PicaResponse bindWeChat(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         long doctorId = super.getDoctorIdByToken();
-        loginService.bindWeChat(doctorId, request);
-        return PicaResponse.toResponse();
+        String nickname = loginService.bindWeChat(doctorId, request);
+        Map<String, String> map = new HashMap();
+        map.put("nickname", nickname);
+        return PicaResponse.toResponse(map);
     }
 
     @ApiOperation("微信解除绑定接口")

server/src/main/java/com/pica/cloud/account/account/server/service/LoginService.java

@@ -49,7 +49,7 @@ public interface LoginService {
      *
      * @param request 参数模型
      */
-    void bindWeChat(long doctorId, BaseRequest request);
+    String bindWeChat(long doctorId, BaseRequest request);
 
     PICAPDoctor queryDoctor(long doctorId);
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/LoginServiceImpl.java

@@ -270,7 +270,7 @@ public class LoginServiceImpl implements LoginService {
 
     @Override
     @Transactional
-    public void bindWeChat(long doctorId, BaseRequest request) {
+    public String bindWeChat(long doctorId, BaseRequest request) {
         WeChatEntity weChatEntity = WeChatUtils.getAuthorizationInfo(appId, appSecret, request.getWeChatCode());
         Map map = new HashMap();
         map.put("access_token", weChatEntity.getAccess_token());
@@ -281,9 +281,12 @@ public class LoginServiceImpl implements LoginService {
         AccountWeChatInfoEntity entity = accountWeChatInfoMapper.selectByUnionId(unionId);
         if (entity == null) {
             processWeChatInfoUser(weChatUserInfoEntity, request.getWeChatLoginType());
+        } else {
+            updateWechatInfoUser(entity, weChatUserInfoEntity);
         }
         Integer acctId = doctorInfoMapper.getAcctIdByDoctorId(doctorId);
         processAccountUnion(acctId, unionId);
+        return weChatUserInfoEntity.getNickname();
     }
 
     /**
@@ -335,6 +338,16 @@ public class LoginServiceImpl implements LoginService {
         accountWeChatInfoMapper.insertSelective(accountWeChatInfoEntity);
     }
 
+    private void updateWechatInfoUser(AccountWeChatInfoEntity entity, WeChatUserInfoEntity weChatUserInfoEntity) {
+        String nickname = weChatUserInfoEntity.getNickname();
+        if (StringUtils.isNotEmpty(nickname) && !nickname.equals(entity.getNickname())) {
+            AccountWeChatInfoEntity info = new AccountWeChatInfoEntity();
+            info.setId(entity.getId());
+            info.setNickname(nickname);
+            accountWeChatInfoMapper.updateByPrimaryKeySelective(info);
+        }
+    }
+
     public PICAPDoctor queryDoctor(long doctorId) {
         PICAPDoctor doctor = doctorInfoMapper.queryDoctor(doctorId);
         if (doctor == null) {