From 50b6ccbf1b59e16a6a19f9240dec5d7abfef195e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 17 Nov 2020 09:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BA=8C=E7=BB=B4=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../group/form/GroupCodeBasicInfoFormDTO.java |  4 ++--
 .../impl/ResiGroupCodeServiceImpl.java        | 11 +++++++++
 .../service/impl/ResiGroupServiceImpl.java    | 17 ++++++++++----
 .../mapper/group/ResiGroupCodeDao.xml         | 23 +++++++++----------
 4 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java
index af31ed7145..b9a6102ecd 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupCodeBasicInfoFormDTO.java
@@ -15,12 +15,12 @@ public class GroupCodeBasicInfoFormDTO implements Serializable {
     /**
      * 客户id
      */
-    //@NotBlank(message = "客户id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
+    @NotBlank(message = "客户id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
     private String customerId;
     /**
      * 网格id
      */
-    //@NotBlank(message = "网格id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
+    @NotBlank(message = "网格id不能为空", groups = {GroupCodeBasicInfoFormDTO.GroupCodeInfo.class})
     private String gridId;
     /**
      * 组id
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
index 5e48167510..a09b756ca6 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
@@ -41,6 +41,7 @@ import com.epmet.modules.group.entity.ResiGroupCodeEntity;
 import com.epmet.modules.group.redis.ResiGroupCodeRedis;
 import com.epmet.modules.group.service.ResiGroupCodeService;
 import com.epmet.modules.utils.ModuleConstant;
+import com.epmet.resi.group.constant.GroupCodeConstant;
 import com.epmet.resi.group.dto.QRCodeMultipartFileDTO;
 import com.epmet.resi.group.dto.group.ResiGroupCodeDTO;
 import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
@@ -268,6 +269,16 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
             logger.error(String.format("获取小组码基本信息失败，小组Id：%s", formDTO.getGroupId()));
             throw new RenException("获取小组码基本信息失败");
         }
+        if (null == resultDTO.getGroupCodeUrl() || "".equals(resultDTO.getGroupCodeUrl())) {
+            CreateGroupCodeFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CreateGroupCodeFormDTO.class);
+            dto.setType(GroupCodeConstant.CODE_TYPE_INVITE);
+            String url = createGroupCode(dto);
+            if (StringUtils.isBlank(url)) {
+                logger.error(String.format("生成小组二维码失败，小组Id：%s", formDTO.getGroupId()));
+                throw new RenException("获取小组码基本信息失败");
+            }
+            resultDTO.setGroupCodeUrl(url);
+        }
         return resultDTO;
     }
 
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 14e71c03bc..7ee707a354 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -45,6 +45,7 @@ import com.epmet.modules.group.dao.ResiGroupOperationDao;
 import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.group.entity.ResiGroupOperationEntity;
 import com.epmet.modules.group.redis.ResiGroupRedis;
+import com.epmet.modules.group.service.ResiGroupCodeService;
 import com.epmet.modules.group.service.ResiGroupOperationService;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.group.service.ResiGroupStatisticalService;
@@ -54,10 +55,7 @@ import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.utils.ModuleConstant;
-import com.epmet.resi.group.constant.EnterGroupTypeConstant;
-import com.epmet.resi.group.constant.GroupStateConstant;
-import com.epmet.resi.group.constant.LeaderFlagConstant;
-import com.epmet.resi.group.constant.MemberStateConstant;
+import com.epmet.resi.group.constant.*;
 import com.epmet.resi.group.dto.UserRoleDTO;
 import com.epmet.resi.group.dto.group.*;
 import com.epmet.resi.group.dto.group.form.*;
@@ -127,6 +125,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
+	@Autowired
+	private ResiGroupCodeService resiGroupCodeService;
+
 	@Override
 	public PageData<ResiGroupDTO> page(Map<String, Object> params) {
 		IPage<ResiGroupEntity> page = baseDao.selectPage(
@@ -520,6 +521,14 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
+		//4-1.2020.11.17 sun  添加小组审核通过后生成小组的二维码图片逻辑 start
+		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);
+		// end
 		//5、给用户发送消息？？？待定
 		//6、新增小组缓存信息、组员缓存信息
 		Map<String, Object> param = new HashMap<>();
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
index 685f645b92..a3cc1c6fd5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupCodeDao.xml
@@ -5,23 +5,22 @@
 
     <select id="selectGroupCodeBasicInfo" resultType="com.epmet.resi.group.dto.group.result.GroupCodeBasicInfoResultDTO">
         SELECT
-            rgc.GROUP_ID AS "groupId",
-            rgc.URL AS "groupCodeUrl",
-            rg.GROUP_NAME AS "groupName",
-            rg.GROUP_HEAD_PHOTO AS "groupHeadPhoto",
-            rg.GROUP_INTRODUCTION AS "groupIntroduction"
+            rg.id AS "groupId",
+            rg.group_name AS "groupName",
+            rg.group_head_photo AS "groupHeadPhoto",
+            rg.group_introduction AS "groupIntroduction",
+            rgc.URL AS "groupCodeUrl"
         FROM
-            resi_group_code rgc
-        INNER JOIN resi_group rg ON rgc.GROUP_ID = rg.ID
+            resi_group rg
+        LEFT JOIN resi_group_code rgc ON rgc.group_id = rg.id AND rgc.del_flag = '0'
         WHERE
-            rgc.DEL_FLAG = '0'
-        AND rg.DEL_FLAG = '0'
-        AND rgc.GROUP_ID = #{groupId}
+            rg.del_flag = '0'
+        AND rg.id = #{groupId}
         <if test='null != customerId and "" != customerId'>
-            and rgc.customer_id = #{customerId}
+            and rg.customer_id = #{customerId}
         </if>
         <if test='null != gridId and "" != gridId'>
-            and rgc.grid_id = #{gridId}
+            and rg.grid_id = #{gridId}
         </if>
     </select>