链接

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

@@ -129,7 +129,7 @@ public class GroupChatHmServiceImpl implements GroupChatHmService {
     }
 
     /**
-     * 处理开启自动建群的,如果群满自动下线后,需要从活码中提出
+     * 处理开启自动建群的,如果群满自动下线后,需要从活码中提出.注意使用的是代开发应用
      */
     private void handleAutoCreateRoom(String wxEnterpriseId, String secret, TabGroupChatHm hm,
             List<TabGroupChatHmRelation> chatRelation) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/hm/HmLinkChatService.java

 package com.gic.haoban.manage.service.service.hm;
 
 import java.util.List;
-import java.util.Map;
-
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.manage.api.dto.hm.HmLinkChatDTO;

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

 package com.gic.haoban.manage.service.service.out.impl.chat;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -43,7 +44,7 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
     public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
         Page<GroupChatHmBO> page = this.groupChatHmService.listPage(qdto, basePageInfo);
         Page<GroupChatHmDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatHmDTO.class);
-        if(CollectionUtils.isNotEmpty(resultPage.getResult())) {
+        if (CollectionUtils.isNotEmpty(resultPage.getResult())) {
             List<Long> chatHmIdList = resultPage.getResult().stream().map(dto -> dto.getChatHmId())
                     .collect(Collectors.toList());
             List<HmLinkChatDTO> linkCount = this.hmLinkChatService.getLinkCountForHm(qdto.getWxEnterpriseId(),
@@ -72,14 +73,19 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
     @Override
     public ServiceResponse<GroupChatHmDTO> save(GroupChatHmDTO dto) {
         String result = this.groupChatHmService.saveHm(dto);
-        if(StringUtils.isNotBlank(result)) {
-            return ServiceResponse.failure("9999", result) ;
+        if (StringUtils.isNotBlank(result)) {
+            return ServiceResponse.failure("9999", result);
         }
         return ServiceResponse.success(dto);
     }
 
     @Override
     public ServiceResponse<Void> discard(Long chatHmId, String wxEnterpriseId, String clerkId, String clerkName) {
+        List<HmLinkChatDTO> linkCount = this.hmLinkChatService.getLinkCountForHm(wxEnterpriseId,
+                Arrays.asList(chatHmId));
+        if (CollectionUtils.isNotEmpty(linkCount) && linkCount.get(0).getLinkCount() > 0) {
+            return ServiceResponse.failure("9999", "当前活码已关联" + linkCount.get(0).getLinkCount() + "个链接，请确认链接已投放结束");
+        }
         this.groupChatHmService.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
         return ServiceResponse.success();
     }

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

@@ -138,18 +138,31 @@ public class GroupChatHmController {
         return RestResponse.successResult(hm);
     }
 
+    /**
+     * 
+    * @Title: discard
+    * @Description: 废弃活码
+    * @author xugh
+    * @param chatHmId
+    * @return
+    * @throws
+     */
     @RequestMapping("discard")
     public RestResponse<Object> discard(Long chatHmId) {
         if (null == chatHmId) {
             return RestResponse.failure("1", "群活码ID空");
         }
+        // 判断是否关联链接
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         String clerkId = loginUser.getClerkId();
         String clerkName = loginUser.getClerkName();
-        this.groupChatHmApiService.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
+        ServiceResponse<Void> resp = this.groupChatHmApiService.discard(chatHmId, wxEnterpriseId, clerkId, clerkName);
+        if (resp.isSuccess()) {
             return RestResponse.successResult();
         }
+        return RestResponse.failure("1", resp.getMessage());
+    }
 
     /**
      *