From 6dab1ffef0f1a307aa5bbad22bd62b9e66b075af Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 17 Nov 2020 17:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9user=E6=9C=8D=E5=8A=A1/userre?=
 =?UTF-8?q?siinfo/getuserresiinfo=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/UserWechatDao.java     |  2 +
 .../service/impl/UserBaseInfoServiceImpl.java | 12 +++---
 .../main/resources/mapper/UserResiInfoDao.xml | 38 ++++++++-----------
 .../main/resources/mapper/UserWechatDao.xml   | 20 ++++++++++
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
index ef513d0ac7..d0f6b2def7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserWechatDao.java
@@ -75,4 +75,6 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
     **/
     List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
 
+    //临时用下in
+    List<UserWechatDTO> selectNotInUserBaseInfoTemp();
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index 7143b7d171..326e74912d 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -166,7 +166,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
      **/
     @Override
     public void initBaseInfo() {
-        List<UserWechatDTO> userWechatDTOList=userWechatDao.selectAll();
+        List<UserWechatDTO> userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp();
         List<String> userIdList=new ArrayList<>();
         for(UserWechatDTO userWechatDTO:userWechatDTOList){
             userIdList.add(userWechatDTO.getUserId());
@@ -202,12 +202,12 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                      break;
                  }
              }
-            UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userBaseInfoEntity.getUserId());
-            if(null==userBaseInfoResultDTO){
-                insert(userBaseInfoEntity);
-            }else{
-                userBaseInfoEntity.setId(userBaseInfoResultDTO.getId());
+            String userBaseInfoId=baseDao.selectIdByUserId(userBaseInfoEntity.getUserId());
+            if(StringUtils.isNotBlank(userBaseInfoId)){
+                userBaseInfoEntity.setId(userBaseInfoId);
                 updateById(userBaseInfoEntity);
+            }else{
+                insert(userBaseInfoEntity);
             }
         }
         return;
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
index fc345f9fd2..0aa445acfa 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
@@ -42,34 +42,28 @@
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
             resultType="com.epmet.dto.result.UserResiInfoResultDTO">
         SELECT
-            uri.id,
-            uc.USER_ID,
+            ubi.USER_ID,
             uri.REG_MOBILE,
-            uri.SURNAME,
-            uri.`NAME`,
-            uri.STREET,
-            uri.DISTRICT,
+            ubi.SURNAME,
+            ubi.`NAME`,
+            ubi.STREET,
+            ubi.DISTRICT,
             uri.RESI_VISIT_ID,
-            uri.BUILDING_ADDRESS,
-            CONCAT(
-            uri.STREET,
-            '-',
-            uri.SURNAME,
-            ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
+            ubi.BUILDING_ADDRESS,
+                CONCAT(
+                ubi.STREET,
+                '-',
+                ubi.SURNAME,
+                ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
             uw.HEAD_IMG_URL AS head_photo
-
         FROM
-            user_customer uc
-            LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID )
-            LEFT JOIN user_wechat uw ON (uc.USER_ID = uw.USER_ID)
+            user_base_info ubi
+            LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' )
+            LEFT JOIN user_wechat uw ON ( uri.USER_ID = uw.USER_ID AND uw.DEL_FLAG = '0' )
         WHERE
-            uc.DEL_FLAG = '0'
-            AND uri.DEL_FLAG = '0'
-            AND uc.CUSTOMER_ID = #{customerId}
-            AND uc.USER_ID = #{userId}
-            AND uw.DEL_FLAG = '0'
-            AND uw.USER_ID = #{userId}
+            ubi.USER_ID =#{userId}
+            AND ubi.DEL_FLAG = '0'
     </select>
 
     <!-- 查询用户注册信息 不按照客户Id查询  -->
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
index 98a5c58075..5797e95eef 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml
@@ -115,4 +115,24 @@
         ORDER BY
            base.REAL_NAME , wechat.NICKNAME
     </select>
+
+    <!--    查询出注册了居民但是不在user_base_info表的-->
+    <select id="selectNotInUserBaseInfoTemp" resultType="com.epmet.dto.UserWechatDTO">
+        SELECT
+            *
+        FROM
+            user_wechat uw
+        WHERE
+            uw.USER_ID IN (
+            SELECT DISTINCT
+                uri.USER_ID
+            FROM
+                user_resi_info uri
+            WHERE
+                uri.USER_ID NOT IN ( SELECT uri.USER_ID FROM user_base_info uri where uri.DEL_FLAG='0')
+                AND uri.DEL_FLAG = '0'
+            )
+            AND uw.DEL_FLAG = '0'
+            and uw.NICKNAME is not null
+    </select>
 </mapper>