Merge remote-tracking branch 'origin/dev_personal_center' into dev_personal_center

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

@@ -12,11 +12,6 @@ import java.io.Serializable;
 @Data
 public class UserResiInfoResultDTO implements Serializable {
 
-	/**
-	 * 唯一标识
-	 */
-	private String id;
-
 	/**
 	 * 用户Id(主键) user.id
 	 */
@@ -61,4 +56,6 @@ public class UserResiInfoResultDTO implements Serializable {
 	 * 用户头像
 	 */
 	private String headPhoto;
+
+	private String nickName;
 }

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

@@ -20,14 +20,17 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserCustomerConstant;
 import com.epmet.dao.*;
-import com.epmet.dto.*;
+import com.epmet.dto.CustomerGridDTO;
+import com.epmet.dto.RegisterRelationDTO;
+import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
@@ -36,10 +39,10 @@ import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
 import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.redis.RegisterRelationRedis;
 import com.epmet.service.GridVisitedService;
 import com.epmet.service.RegisterRelationService;
 import com.epmet.util.ModuleConstant;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -243,6 +246,11 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                 resultObj.setNickname(userResiInfo.getShowName());
                 resultObj.setUserHeadPhoto(userResiInfo.getHeadPhoto());
             }
+            List<UserWechatEntity> userWechatEntityList=userWechatDao.selectByUserId(enterGridFormDTO.getUserId());
+            if(CollectionUtils.isNotEmpty(userWechatEntityList)){
+                resultObj.setNickname(StringUtils.isNotBlank(userWechatEntityList.get(0).getNickname())?userWechatEntityList.get(0).getNickname(): StrConstant.EPMETY_STR);
+                resultObj.setUserHeadPhoto(StringUtils.isNotBlank(userWechatEntityList.get(0).getHeadImgUrl())?userWechatEntityList.get(0).getHeadImgUrl(): StrConstant.EPMETY_STR);
+            }
         }
 
         //3.获取权限

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

@@ -66,7 +66,8 @@
                 ubi.SURNAME,
                 ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
-            ubi.HEAD_IMG_URL AS head_photo
+            ubi.HEAD_IMG_URL AS head_photo,
+            ubi.NICKNAME as nickName
         FROM
             user_base_info ubi
             LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' )
@@ -88,12 +89,10 @@
             ) AS show_name
         FROM
             user_resi_info uri
-            LEFT JOIN user_wechat uw ON (uri.USER_ID = uw.USER_ID)
+            LEFT JOIN user_wechat uw ON (uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' AND uw.USER_ID = #{userId})
         WHERE
             uri.DEL_FLAG = '0'
-            AND uw.DEL_FLAG = '0'
             AND uri.USER_ID = #{userId}
-            AND uw.USER_ID = #{userId}
     </select>
 
     <select id="selectResiInfoByMobile" parameterType="string"
@@ -112,24 +111,24 @@
     <!-- 根据userId集合查询用户注册信息   -->
     <select id="selectListUserResiInfoDTO" resultType="com.epmet.dto.result.UserResiInfoResultDTO">
          SELECT
-            uri.id,
-            uri.USER_ID,
+            ubi.USER_ID,
             uri.REG_MOBILE,
-            uri.SURNAME,
-            uri.`NAME`,
-            uri.STREET,
-            uri.DISTRICT,
-            uri.BUILDING_ADDRESS,
+            ubi.SURNAME,
+            ubi.`NAME`,
+            ubi.STREET,
+            ubi.DISTRICT,
+            ubi.BUILDING_ADDRESS,
             CONCAT(
-            uri.STREET,
+            ubi.STREET,
             '-',
-            uri.SURNAME,
-            ( CASE WHEN uri.GENDER = '1' THEN '先生' WHEN uri.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
+            ubi.SURNAME,
+            ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
-            uri.HEAD_IMG_URL as head_photo
-        FROM user_resi_info uri
-        WHERE uri.DEL_FLAG = '0'
-        AND uri.USER_ID in
+            ubi.HEAD_IMG_URL as head_photo
+        FROM user_base_info ubi
+        left join user_resi_info uri on(ubi.user_id=uri.user_id and uri.del_flag='0')
+        WHERE ubi.DEL_FLAG = '0'
+        AND ubi.USER_ID in
         <foreach item="userId" collection="userIdList" separator="," open="(" close=")" index="">
             #{userId}
         </foreach>