Merge branch 'feature/社群' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into feature/社群

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/chat/TabGroupChat.java

@@ -56,14 +56,14 @@ public class TabGroupChat implements Serializable{
 	private String wxChatIdDk;
 	private Date offTime ;
 	private String originalStaffId ;
-	private int hmAddStatus = 1 ;
+	private String chatRemark ;
 	
-	public int getHmAddStatus() {
-        return hmAddStatus;
+    public String getChatRemark() {
+        return chatRemark;
     }
 
-    public void setHmAddStatus(int hmAddStatus) {
-        this.hmAddStatus = hmAddStatus;
+    public void setChatRemark(String chatRemark) {
+        this.chatRemark = chatRemark;
     }
 
     public Date getOffTime() {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatPlanOwnerLogServiceImpl.java

@@ -181,9 +181,12 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
     @Override
     public Page<ChatOwnerTotalDTO> listOwnerLogPageForWxaTotal(GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
-        PageHelper.startPage(basePageInfo);
         String clerkId = qdto.getClerkId();
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId);
+        if(null == clerk) {
+            logger.info("导购不存在");
+            return new Page<ChatOwnerTotalDTO>();
+        }
         int clerkType = clerk.getClerkType();
         String storeId = null;
         if (clerkType == 1) {
@@ -191,6 +194,7 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             clerkId = null;
         }
         qdto.setStoreId(storeId);
+        PageHelper.startPage(basePageInfo);
         List<ChatOwnerTotalDTO> list = this.groupChatPlanOwnerLogMapper.listOwnerLogPageForWxaTotal(qdto);
         Page<ChatOwnerTotalDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, ChatOwnerTotalDTO.class);
         return retPage;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -126,7 +126,7 @@ public class GroupChatServiceImpl implements GroupChatService {
     private static GicMQClient mqClient = GICMQClientUtil.getClientInstance();
 
     // 每次拉取成员数
-    private int pageSize = 800;
+    private int pageSize = 100;
     // 每次拉取群数
     private int limit = 1;
     // 群下线成员数
@@ -245,18 +245,18 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     @Override
     public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
+        List<TabGroupChatHmRelation> relationList = null;
         if (null != qdto.getChatHmId()) {
-            List<TabGroupChatHmRelation> list = null;
             if (qdto.getIncludeOff() == 1) {
-                list = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
+                relationList = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
             } else {
-                list = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
+                relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
             }
-            if (CollectionUtils.isEmpty(list)) {
+            if (CollectionUtils.isEmpty(relationList)) {
                 return new Page<GroupChatDTO>();
             }
-            logger.info("活码页查询群列表{},关联群数={}", qdto.getChatHmId(), list.size());
-            List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
+            logger.info("活码页查询群列表{},关联群数={}", qdto.getChatHmId(), relationList.size());
+            List<Long> groupChatIdList = relationList.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
             qdto.setGroupChatIdList(groupChatIdList);
         }
         qdto.setDepartmentIdList(this.setDepartIdList(qdto.getWxEnterpriseId(), qdto.getDepartmentId()));
@@ -267,6 +267,15 @@ public class GroupChatServiceImpl implements GroupChatService {
             qdto.setSearchParams("%" + params + "%");
         }
         List<GroupChatDTO> list = this.groupChatMapper.list(qdto);
+        if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(relationList)) {
+            Map<Long,Date> offMap = relationList.stream().filter(dto->dto.getStatusFlag()==2).collect(Collectors.toMap(TabGroupChatHmRelation::getGroupChatId,TabGroupChatHmRelation::getUpdateTime,(k1,k2)->k1));
+            for(GroupChatDTO dto : list) {
+                if(null != offMap.get(dto.getGroupChatId())) {
+                    dto.setOffTime( offMap.get(dto.getGroupChatId()));
+                    dto.setHmAddStatus(2);
+                }
+            }
+        }
         Page<GroupChatDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatDTO.class);
         return retPage;
     }
@@ -1073,7 +1082,7 @@ public class GroupChatServiceImpl implements GroupChatService {
             // 通知处理群活码
             try {
                 TabGroupChat chat = this.groupChatMapper.selectById(groupChatId);
-                if (null == chat || chat.getHmAddStatus() == 1 || null == chat.getOffTime()) {
+                if (null == chat || chat.getTotalCount() < offNum) {
                     continue;
                 }
                 if (chat.getOffTime().getTime() + 1000 * 60 * 60 * 8 < new Date().getTime()) {

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmRelationMapper.xml

@@ -100,6 +100,6 @@
 		 	#{id}
 		 </foreach>
 		 and relation.delete_flag = 0 and relation.status_flag = 1 and chat.delete_flag = 0 and chat.chat_status in (0,1,2,3)
-		 and chat.`hm_add_status` = 1 GROUP BY relation.`chat_hm_id` 
+		 and chat.total_count <![CDATA[<]]> 200 GROUP BY relation.`chat_hm_id` 
 	</select>
 </mapper> 
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanOwnerLogMapper.xml

@@ -157,14 +157,19 @@
   	 	
   	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
   	  where 
-  	  	a.wx_enterprise_id = #{wxEnterpriseId}
+  	  	a.wx_enterprise_id = #{wxEnterpriseId} and b.delete_flag = 0
   	  	<if test="null != storeId">
   	  		 and a.store_id = #{storeId}
   	  	</if>
   	  	<if test="null != clerkId">
   	  		and a.clerk_id = #{clerkId}
   	  	</if>
+  	  	<if test="null != sendStatus">
+  	  		and a.send_status = #{sendStatus}
+  	  	</if>
   	  	group by b.plan_id
+  	  	
+  	  	order by a.create_time desc , a.owner_log_id
   </select>
   
   <select id="listOwnerLogPageForWxa"  parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultType="com.gic.haoban.manage.api.dto.chat.GroupChatPlanOwnerLogDTO">
@@ -185,13 +190,17 @@
   	 	a.done_flag   doneFlag ,
   	 	a.msgid       msgid 
   	  from tab_haoban_group_chat_plan_owner_log a left join tab_haoban_group_chat_plan b on a.plan_id = b.plan_id 
-  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  
+  	  where a.wx_enterprise_id = #{wxEnterpriseId} and a.plan_id = #{planId}  and b.delete_flag = 0
   	  	<if test="null != storeId">
   	  		 and a.store_id = #{storeId}
   	  	</if>
   	  	<if test="null != clerkId">
   	  		and a.clerk_id = #{clerkId}
   	  	</if>
+  	  	<if test="null != sendStatus">
+  	  		and a.send_status = #{sendStatus}
+  	  	</if>
+  	  	 order by a.create_time desc , a.owner_log_id
   </select>
   
 </mapper> 
\ No newline at end of file

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatHmController.java

@@ -387,11 +387,13 @@ public class GroupChatHmController {
         ServiceResponse<Page<GroupChatDTO>> pageResp = this.groupChatApiService.listPage(qdto, basePageInfo);
         Page<GroupChatDTO> page = pageResp.getResult();
         List<GroupChatDTO> list = page.getResult();
-        list.stream().forEach(dto->{
-            if(dto.getTotalCount()>=200) {
-                dto.setHmAddStatus(2);
-            }
-        });
+        if(CollectionUtils.isNotEmpty(list)) {
+            list.stream().forEach(dto->{
+                if(dto.getTotalCount()>=200) {
+                    dto.setHmAddStatus(2);
+                }
+            });
+        }
         return RestResponse.successResult(page);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/haoban/GroupChatPlanController.java

@@ -29,11 +29,11 @@ import com.gic.haoban.manage.api.service.chat.GroupChatPlanApiService;
 
 /**
  * 
-* @ClassName: GroupChatPlanController
-* @Description: 群群发计划
-* @author xugh
-* @date 2022年11月26日 上午9:32:56
-*
+ * @ClassName: GroupChatPlanController
+ * @Description: 群群发计划
+ * @author xugh
+ * @date 2022年11月26日 上午9:32:56
+ *
  */
 @RestController
 @RequestMapping("/chat/plan")
@@ -47,23 +47,26 @@ public class GroupChatPlanController {
     private MaterialApiService materialApiService;
 
     @RequestMapping("total-list")
-    public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,String searchParams ,
-            BasePageInfo basePageInfo) {
+    public RestResponse<Object> totalList(String clerkId, String wxEnterpriseId, String enterpriseId,
+            String searchParams, BasePageInfo basePageInfo) {
+        if (StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("1", "clerkId为空");
+        }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         qdto.setClerkId(clerkId);
-        if(StringUtils.isNotBlank(searchParams)) {
+        if (StringUtils.isNotBlank(searchParams)) {
             qdto.setSearchParams(searchParams);
         }
-        ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService.listOwnerLogPageForWxaTotal(qdto,
-                basePageInfo);
-        Page<ChatOwnerTotalDTO> page =  pageResp.getResult() ;
-        if(null != page.getResult()) {
-            page.getResult().forEach(dto->{
-                if(dto.getEndTime().before(new Date())) {
+        ServiceResponse<Page<ChatOwnerTotalDTO>> pageResp = this.groupChatPlanApiService
+                .listOwnerLogPageForWxaTotal(qdto, basePageInfo);
+        Page<ChatOwnerTotalDTO> page = pageResp.getResult();
+        if (null != page.getResult()) {
+            page.getResult().forEach(dto -> {
+                if (dto.getEndTime().before(new Date())) {
                     dto.setPlanStatus(2);
-                }else {
+                } else {
                     dto.setPlanStatus(1);
                 }
             });
@@ -73,6 +76,9 @@ public class GroupChatPlanController {
 
     @RequestMapping("owner-list")
     public RestResponse<Object> ownerList(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        if (null == qdto.getPlanId()) {
+            return RestResponse.failure("1", "planid为空");
+        }
         ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> page = this.groupChatPlanApiService.listOwnerLogPageForWxa(qdto,
                 basePageInfo);
         return RestResponse.successResult(page.getResult());
@@ -86,8 +92,11 @@ public class GroupChatPlanController {
 
     @RequestMapping("detail")
     public RestResponse<Object> detail(Long planId) {
+        if (null == planId) {
+            return RestResponse.failure("1", "planid为空");
+        }
         ServiceResponse<GroupChatPlanDTO> linkResp = this.groupChatPlanApiService.detail(planId);
-        if (!linkResp.isSuccess()) {
+        if (!linkResp.isSuccess() || null == linkResp.getResult()) {
             return RestResponse.failure("1", "计划不存在");
         }
         GroupChatPlanDTO plan = linkResp.getResult();
@@ -109,6 +118,9 @@ public class GroupChatPlanController {
     @RequestMapping("owner-do-list")
     public RestResponse<Object> ownerDoList(Long planId, String clerkId, String wxEnterpriseId, String enterpriseId,
             Long ownLogId, BasePageInfo basePageInfo) {
+        if (null == ownLogId || null == planId || StringUtils.isEmpty(clerkId)) {
+            return RestResponse.failure("1", "参数未传");
+        }
         GroupChatPlanSearchQDTO qdto = new GroupChatPlanSearchQDTO();
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);