Merge branch 'dev'

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

@@ -90,6 +90,25 @@ public class ExtUserInfoResultDTO implements Serializable {
      */
     private String gender = "";
 
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
 
     /**
      * 用户角色列表

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -80,6 +80,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronizationAdapter;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
 
 import java.text.SimpleDateFormat;
@@ -570,16 +572,21 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//4-1.2020.11.17 sun  添加小组审核通过后生成小组的二维码图片逻辑 start
-		try {
-			CreateGroupCodeFormDTO dto = new CreateGroupCodeFormDTO();
-			dto.setCustomerId(resiGroupDTO.getCustomerId());
-			dto.setGridId(resiGroupDTO.getGridId());
-			dto.setGroupId(resiGroupDTO.getId());
-			dto.setType(GroupCodeConstant.CODE_TYPE_INVITE);
-			resiGroupCodeService.createGroupCode(dto ,false);
-		} catch (Exception e) {
-			logger.error(String.format("小组审核通过，生成小组二维码失败", e.getMessage()));
-		}
+		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+			@Override
+			public void afterCommit() {
+				try {
+					CreateGroupCodeFormDTO dto = new CreateGroupCodeFormDTO();
+					dto.setCustomerId(resiGroupDTO.getCustomerId());
+					dto.setGridId(resiGroupDTO.getGridId());
+					dto.setGroupId(resiGroupDTO.getId());
+					dto.setType(GroupCodeConstant.CODE_TYPE_INVITE);
+					resiGroupCodeService.createGroupCode(dto ,false);
+				} catch (Exception e) {
+					logger.error(String.format("小组审核通过，生成小组二维码失败", e.getMessage()));
+				}
+			}
+		});
 		// end
 		//5、给用户发送消息？？？待定
 		//6、新增小组缓存信息、组员缓存信息

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

@@ -377,6 +377,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setProfile(userMsg.getHeadImgUrl());
             result.setNickname(userMsg.getNickname());
             result.setRealName(userMsg.getRealName());
+            result.setStreet(userMsg.getStreet());
+            result.setDistrict(userMsg.getDistrict());
+            result.setBuildingAddress(userMsg.getBuildingAddress());
+            result.setIdNum(userMsg.getIdNum());
             // 2020.11.24 sun  start
             result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
             List<UserWechatEntity> list = userWechatDao.selectByUserId(param.getUserId());