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

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、新增小组缓存信息、组员缓存信息