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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/chat/JoinRuleManager.java

@@ -313,6 +313,7 @@ public class JoinRuleManager {
         }
         //获取storeId对应活码
         Map<String, List<GroupChatHmBO>> storeToHmMap = getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
+        addSetHm(storeIds, storeToHmMap);
         if (MapUtil.isEmpty(storeToHmMap)) {
             return new ArrayList<>();
         }
@@ -336,6 +337,24 @@ public class JoinRuleManager {
         return storeToHmMap.get(storeId);
     }
 
+    public void addSetHm(List<String> storeIds, Map<String, List<GroupChatHmBO>> storeToHmMap) {
+        List<TabGroupChatHm> hmList = groupChatHmMapper.listByStoreIdList(storeIds) ;
+        if(CollectionUtils.isNotEmpty(hmList)) {
+            List<GroupChatHmBO> setList = EntityUtil.changeEntityListByJSON(GroupChatHmBO.class,hmList) ;
+            Map<String,List<GroupChatHmBO>> setMap = setList.stream().collect(Collectors.groupingBy(o->o.getStoreId(),Collectors.toList()));
+            Set<String> set = setMap.keySet();
+            Iterator<String> it = set.iterator();
+            while (it.hasNext()) {
+                String key = it.next() ;
+                if(null != storeToHmMap.get(key)) {
+                    storeToHmMap.get(key).addAll(setMap.get(key));
+                }else {
+                    storeToHmMap.put(key,setMap.get(key));
+                }
+            }
+        }
+    }
+
     /**
      * 根据门店id获取群活码
      * @param enterpriseId  企业id

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

@@ -524,7 +524,7 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
 
     @Override
     public void doPlanSendInfoTimer(String params) {
-        DingUtils.send("开始群群发统计(定时),params=" + params + ",tranceid=" + ProviderLocalTag.tag.get().traceId, false);
+        // DingUtils.send("开始群群发统计(定时),params=" + params + ",tranceid=" + ProviderLocalTag.tag.get().traceId, false);
         Long planId = Long.parseLong(params);
         List<Long> idList = this.groupChatPlanOwnerLogService.listForTimer(planId);
         logger.info("定时处理群发结果,条数={}", idList.size());
@@ -908,6 +908,9 @@ public class GroupChatPlanServiceImpl implements GroupChatPlanService {
         Date startTime =  DateUtil.addNumForSecond(sendTime,-30) ;
         Date endTime = DateUtil.addNumForMinute(sendTime,2) ;
         TabHaobanStaff staff =  this.staffMapper.selectByPrimaryKey(staffId) ;
+        if(null == staff) {
+            return null ;
+        }
         String wxEnterpriseId = staff.getWxEnterpriseId() ;
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         String wxUserId = staff.getWxUserId() ;

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

@@ -311,7 +311,7 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
             QywxTransferCustomerDTO transferCustomerResp = qywxUserApiService.transferCustomer(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), wxUserId, takeoverUserId, list,qwDTO.isSelf(),qwDTO.getUrlHost());
             if (transferCustomerResp.getErrcode() != 0) {
                 logger.info("离职继承-分配客户异常={}",JSONObject.toJSONString(transferCustomerResp));
-                DingUtils.send("离职继承分配异常"+wxUserId,true);
+                // DingUtils.send("离职继承分配异常"+wxUserId,true);
             }
             List<QywxTransferCustomerInfoDTO> customer = transferCustomerResp.getCustomer();
             if (CollectionUtils.isEmpty(customer)) {

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

@@ -494,7 +494,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
                 if(times>maxCount) {
                     if(!needToMq2(wxEnterpriseId)) {
                         log.info("加好友计数发送告警,id={}",wxEnterpriseId);
-                        DingUtils.send("加好友mq切换,企业="+ wxEnterpriseId, false);
+                        // DingUtils.send("加好友mq切换,企业="+ wxEnterpriseId, false);
                     }
                     log.info("加好友计数,自动到userMq2,{}",wxEnterpriseId);
                     this.addToMq2Mark(wxEnterpriseId);

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

@@ -1098,6 +1098,10 @@ public class StaffApiServiceImpl implements StaffApiService {
                 String storeWidgetId = this.powerService.getStoreWidgetId(null, clerkId);
                 if(null != storeWidgetId) {
                     Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, clerkDTO.getEnterpriseId(), pageParam, null,null);
+                    if(null == page || CollectionUtils.isEmpty(page.getResult())) {
+                        storeRoleDTO.setStoreCount(0);
+                        return storeRoleDTO;
+                    }
                     storeId = page.getResult().get(0).getStoreId();
                     storeCount = page.getTotalCount();
                 }

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

@@ -238,6 +238,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         List<GroupChatHmBO> hmBOList = joinRuleManager.handleMainStore(hmQDTO);
                         if(CollectionUtils.isNotEmpty(hmBOList)) {
                             int sort = new Random().nextInt(hmBOList.size()) ;
+                            log.info("{}",sort);
                             hmId = hmBOList.get(sort).getChatHmId() ;
                             break;
                         }
@@ -270,6 +271,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                             log.info("lbs门店={}",storeIds);
                             //获取storeId对应活码
                             Map<String, List<GroupChatHmBO>> storeToHmMap = this.joinRuleManager.getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
+                            this.joinRuleManager.addSetHm(storeIds, storeToHmMap);
                             if (MapUtil.isEmpty(storeToHmMap)) {
                                 break;
                             }