Merge remote-tracking branch 'remotes/origin/dev_more_appid' into dev

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

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 客户用户关系表
@@ -13,4 +14,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface UserCustomerDao extends BaseDao<UserCustomerEntity> {
 
+	/**
+	 * desc:修改客户的用户的注册状态为已注册
+	 *
+	 * @param customerId
+	 * @param userId
+	 * @return
+	 */
+	int updateRegistered(@Param("customerId") String customerId, @Param("userId") String userId);
 }

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

@@ -31,6 +31,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.dao.UserWechatDao;
 import com.epmet.dto.UserResiInfoDTO;
@@ -84,6 +85,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	private UserBaseInfoService userBaseInfoService;
 	@Autowired
 	private UserWechatDao userWechatService;
+	@Autowired
+	private UserCustomerDao userCustomerDao;
 
 	@Override
 	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -244,6 +247,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
 		Result result = new Result();
 
@@ -258,6 +262,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;

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;

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

@@ -3,18 +3,8 @@
 
 <mapper namespace="com.epmet.dao.UserCustomerDao">
 
-
+    <update id="updateRegistered">
-    <resultMap type="com.epmet.entity.UserCustomerEntity" id="userCustomerMap">
+        update set IS_REGISTER = 1 where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and USER_ID = #{userId,jdbcType=VARCHAR}
-        <result property="id" column="ID"/>
+    </update>
-        <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>
 
 </mapper>

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集合查询用户注册信息   -->