外挂接口添加返参

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java

@@ -78,17 +78,17 @@ public class ExtUserInfoResultDTO implements Serializable {
     /**
      * 手机号(注册手机号)
      */
-    private String mobile;
+    private String mobile = "";
 
     /**
      * 用户微信openId
      * */
-    private String wxOpenId;
+    private String wxOpenId = "";
 
     /**
      * 性别（1男2女0未知）
      */
-    private String gender;
+    private String gender = "";
 
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java

@@ -97,11 +97,6 @@ public class UserBaseInfoResultDTO implements Serializable {
      * */
     private String showName;
 
-    /**
-     * 用户微信openId
-     * */
-    private String wxOpenId;
-
     /**
      * 微信基本信息
      */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -34,6 +34,7 @@ import com.epmet.dto.form.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserBaseInfoEntity;
+import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -74,8 +75,6 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private GridLatestDao gridLatestDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-    @Autowired
-    private UserBaseInfoDao userBaseInfoDao;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -323,7 +322,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         result.setUserId(param.getUserId());
         //2020.11.24 sun 对外接口添加一个手机号返参和openId，因openId不在缓存中因此不在走缓存，直接掉sql查询  start
         //UserBaseInfoResultDTO userMsg = userBaseInfoRedis.getUserInfo(param.getUserId());
-        UserBaseInfoResultDTO userMsg = userBaseInfoDao.selectListByUserIdList(param.getUserId());
+        UserBaseInfoResultDTO userMsg = baseDao.selectListByUserIdList(param.getUserId());
         // end
         if(null != userMsg) {
             result.setProfile(userMsg.getHeadImgUrl());
@@ -331,7 +330,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setRealName(userMsg.getRealName());
             // 2020.11.24 sun  start
             result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
-            result.setWxOpenId(StringUtils.isNotBlank(userMsg.getWxOpenId()) ? userMsg.getWxOpenId() : "");
+            List<UserWechatEntity> list = userWechatDao.selectByUserId(param.getUserId());
+            if (list.size() > NumConstant.ZERO) {
+                result.setWxOpenId(StringUtils.isNotBlank(list.get(NumConstant.ZERO).getWxOpenId()) ? list.get(NumConstant.ZERO).getWxOpenId() : "");
+            }
             result.setGender(StringUtils.isNotBlank(userMsg.getGender()) ? userMsg.getGender() : "");
             //end
         }else{

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -40,8 +40,7 @@
         ubi.DISTRICT,
         ubi.BUILDING_ADDRESS,
         wechat.NICKNAME,
-        wechat.HEAD_IMG_URL,
-        wechat.WX_OPEN_ID AS "wxOpenId"
+        wechat.HEAD_IMG_URL
     FROM
         user_wechat wechat
         LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID