Merge remote-tracking branch 'origin/developer' into developer

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

@@ -49,6 +49,10 @@ public class HmLinkChatServiceImpl implements HmLinkChatService {
     public int save(String wxEnterpriseId,String enterpriseId,Long linkId, List<HmLinkChatDTO> list, Long otherHmId, TabHmLink oldLink) {
         log.info("保存群链接={}", JSON.toJSONString(list));
         List<HmLinkChatDTO> oldList = this.hmLinkChatMapper.listByLinkId(wxEnterpriseId, enterpriseId, linkId) ;
+        if(CollectionUtils.isEmpty(list)) {
+            log.info("删除关联群活码={},{}", linkId, null);
+            this.hmLinkChatMapper.delete(linkId, null , 0);
+        }
         if(CollectionUtils.isNotEmpty(list)) {
             List<HmLinkChatDTO> updateList = list.stream().filter(dto -> null != dto.getLinkChatId()).collect(Collectors.toList());
             List<Long> notDelIdList = updateList.stream().map(dto -> dto.getLinkChatId()).collect(Collectors.toList());

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -223,7 +223,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
             hmQDTO.setInStoreId(inStoreId);
             List<GroupChatHmBO> hmBOList = joinRuleManager.handleMainStore(hmQDTO);
             if(CollectionUtils.isNotEmpty(hmBOList)) {
-                hmId = hmBOList.get(0).getChatHmId() ;
+                int sort = new Random().nextInt(hmBOList.size()) ;
+                hmId = hmBOList.get(sort).getChatHmId() ;
             }
         }else {
             JSONArray arr = JSONArray.parseArray(chatStoreRule) ;
@@ -236,14 +237,16 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         log.info("服务门店");
                         List<GroupChatHmBO> hmBOList = joinRuleManager.handleMainStore(hmQDTO);
                         if(CollectionUtils.isNotEmpty(hmBOList)) {
-                            hmId = hmBOList.get(0).getChatHmId() ;
+                            int sort = new Random().nextInt(hmBOList.size()) ;
+                            hmId = hmBOList.get(sort).getChatHmId() ;
                             break;
                         }
                     }else if(type==2) {
                         log.info("协管门店");
                         List<GroupChatHmBO> hmBOList = joinRuleManager.handleOtherStore(hmQDTO);
                         if(CollectionUtils.isNotEmpty(hmBOList)) {
-                            hmId = hmBOList.get(0).getChatHmId() ;
+                            int sort = new Random().nextInt(hmBOList.size()) ;
+                            hmId = hmBOList.get(sort).getChatHmId() ;
                             break;
                         }
                     }else if(type==3) {