Merge branch 'feature-content2' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/GroupMessageServiceImpl.java

@@ -34,6 +34,7 @@ import com.gic.wechat.api.dto.qywx.group.QywxGroupMsgSendResultDTO;
 import com.gic.wechat.api.dto.qywx.group.QywxMomentRespDTO;
 import com.gic.wechat.api.dto.qywx.group.QywxMomentSendResultRespDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -344,10 +345,13 @@ public class GroupMessageServiceImpl implements GroupMessageService {
                 log.info("处理导购群发朋友圈触达客户日志, 成员无好友. staffId:{}", clerkShareLogBo.getStaffId());
                 return;
             }
-            List<TriggerCustomerDetailBO> customerDetailBos = externalUserIds.stream()
-                    .map(item -> this.convertCustomerDetailLog(clerkShareLogBo, item))
-                    .collect(Collectors.toList());
-            triggerCustomerDetailService.batchSave(customerDetailBos);
+            List<List<String>> partition = Lists.partition(externalUserIds, 1000);
+            for (List<String> userIds : partition) {
+                List<TriggerCustomerDetailBO> customerDetailBos = userIds.stream()
+                        .map(item -> this.convertCustomerDetailLog(clerkShareLogBo, item))
+                        .collect(Collectors.toList());
+                triggerCustomerDetailService.batchSave(customerDetailBos);
+            }
         }
     }
 
@@ -551,11 +555,14 @@ public class GroupMessageServiceImpl implements GroupMessageService {
         if (CollectionUtils.isEmpty(groupMsgSendResultInfos)) {
             return;
         }
-        List<TriggerCustomerDetailBO> customerDetailBos = groupMsgSendResultInfos
-                .stream()
-                .map(item -> this.convertCustomerDetailLog(clerkShareLogBO, item.getExternalUserId()))
-                .collect(Collectors.toList());
-        triggerCustomerDetailService.batchSave(customerDetailBos);
+        List<List<QywxGroupMsgSendResultDTO.GroupMsgSendResultInfo>> partition = Lists.partition(groupMsgSendResultInfos, 1000);
+        for (List<QywxGroupMsgSendResultDTO.GroupMsgSendResultInfo> msgSendResultInfos : partition) {
+            List<TriggerCustomerDetailBO> customerDetailBos = msgSendResultInfos
+                    .stream()
+                    .map(item -> this.convertCustomerDetailLog(clerkShareLogBO, item.getExternalUserId()))
+                    .collect(Collectors.toList());
+            triggerCustomerDetailService.batchSave(customerDetailBos);
+        }
     }
 
     /**
@@ -569,11 +576,14 @@ public class GroupMessageServiceImpl implements GroupMessageService {
         if (CollectionUtils.isEmpty(groupChatUserBos)) {
             return;
         }
-        List<TriggerCustomerDetailBO> customerDetailBos = groupChatUserBos
-                .stream()
-                .map(item -> this.convertCustomerDetailLog(clerkShareLogBO, item.getUserId()))
-                .collect(Collectors.toList());
-        triggerCustomerDetailService.batchSave(customerDetailBos);
+        List<List<GroupChatUserBO>> partition = Lists.partition(groupChatUserBos, 1000);
+        for (List<GroupChatUserBO> groupChatUserBOS : partition) {
+            List<TriggerCustomerDetailBO> customerDetailBos = groupChatUserBOS
+                    .stream()
+                    .map(item -> this.convertCustomerDetailLog(clerkShareLogBO, item.getUserId()))
+                    .collect(Collectors.toList());
+            triggerCustomerDetailService.batchSave(customerDetailBos);
+        }
     }
 
     private TriggerCustomerDetailBO convertCustomerDetailLog(ClerkShareLogBO clerkShareLogBO, String externalUserId) {

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/MaterialReportServiceImpl.java

@@ -77,6 +77,10 @@ public class MaterialReportServiceImpl implements MaterialReportService {
                 .build();
         // 获取成员关联的导购
         materialReportBuilder.buildStaffRelationClerk(context);
+        if (CollectionUtils.isEmpty(context.getStaffClerkRelations())) {
+            log.info("处理成员周报月报数据, 成员{}未绑定导购", staffId);
+            return;
+        }
         // 判断是区经还是 店长/导购 填充主门店
         materialReportBuilder.fillMainStore(context);
         // 获取素材数据