From b627bb3712a7bec5826e997cebfc3e2438a29b82 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 29 Jul 2020 17:32:41 +0800
Subject: [PATCH] =?UTF-8?q?user=5Fcustomer=E6=B7=BB=E5=8A=A0=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E6=B3=A8=E5=86=8C=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dao/UserCustomerDao.java | 11 ++++++++++-
 .../service/impl/UserResiInfoServiceImpl.java    |  8 +++++++-
 .../db/migration/V0.0.5__add_isRegister.sql      |  8 ++++++++
 .../main/resources/mapper/UserCustomerDao.xml    | 16 +++-------------
 .../main/resources/mapper/UserResiInfoDao.xml    |  1 +
 5 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java
index 4dc226e8a7..04473a7b88 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserCustomerDao.java
@@ -3,6 +3,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.UserCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description 客户用户关系表
@@ -11,6 +12,14 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2020.03.31 13:53
  */
 @Mapper
-public interface UserCustomerDao extends BaseDao<UserCustomerEntity>{
+public interface UserCustomerDao extends BaseDao<UserCustomerEntity> {
 
+	/**
+	 * desc:修改客户的用户的注册状态为已注册
+	 *
+	 * @param customerId
+	 * @param userId
+	 * @return
+	 */
+	int updateRegistered(@Param("customerId") String customerId, @Param("userId") String userId);
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
index 0ccd75bf6a..c2e90bfcf4 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
+import com.epmet.dao.UserCustomerDao;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserResiRegisterVisitDTO;
@@ -79,6 +80,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	private UserRoleService userRoleService;
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+	@Autowired
+	private UserCustomerDao userCustomerDao;
 
 	@Override
 	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -208,7 +211,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//2:判断手机号是否可用
 		//2020-07-29 根据要注册的网格获取客户Id
 		UserResiRegisterVisitDTO registerVisitDTO = userResiRegisterVisitService.get(verificationCodeFormDTO.getResiVisitId());
-		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getCustomerId())) {
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getUserId())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//3:调用短信服务 生成验证码发送短信
@@ -227,6 +230,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
 		Result result = new Result();
 
@@ -241,6 +245,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userRole.setUserId(userResiInfoDTO.getUserId());
 			userRole.setRoleKey(UserConstant.ROLE_RESI);
 			userRoleService.saveUserRole(userRole);
+			//更新该用户在该客户下的注册状态
+			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}
 
 		return result;
diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql
new file mode 100644
index 0000000000..b7e91cf29b
--- /dev/null
+++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__add_isRegister.sql
@@ -0,0 +1,8 @@
+ALTER TABLE `epmet_user`.`user_customer`
+ADD COLUMN `IS_REGISTER` varchar(1) NOT NULL DEFAULT 0 COMMENT '是否注册 1注册； 0未注册' AFTER `USER_ID`;
+UPDATE user_customer uc,
+register_relation t
+SET uc.IS_REGISTER = 1
+WHERE
+	uc.CUSTOMER_ID = t.CUSTOMER_ID
+	AND t.USER_ID = uc.USER_ID;
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml
index d775556e5e..e0f152a871 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserCustomerDao.xml
@@ -3,18 +3,8 @@
 
 <mapper namespace="com.epmet.dao.UserCustomerDao">
 
-
-    <resultMap type="com.epmet.entity.UserCustomerEntity" id="userCustomerMap">
-        <result property="id" column="ID"/>
-        <result property="app" column="APP"/>
-        <result property="roleName" column="ROLE_NAME"/>
-        <result property="roleKey" column="ROLE_KEY"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
+    <update id="updateRegistered">
+        update set IS_REGISTER = 1 where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and USER_ID = #{userId,jdbcType=VARCHAR}
+    </update>
 
 </mapper>
\ No newline at end of file
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 067c49a86a..9221d0c011 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
@@ -103,6 +103,7 @@
         uri.DEL_FLAG = '0'
         AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR}
         AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
+        AND uc.IS_REGISTER = 1
     </select>
 
     <!-- 根据userId集合查询用户注册信息   -->