From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index 00d2f47..265ce73 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -200,28 +200,34 @@
boolean hasMore = true;
int currentNum = 0;
Date cdate = new Date();
+ List<CRMDaogouBindListResponse> allList = new ArrayList<>();
while (hasMore){
try {
request.setPage(request.getPage()+1);
- currentNum += currentNum;
CRMBaseResponse<List<CRMDaogouBindListResponse>> response = zbomCRMService.getDaogouBindList(request);
if(response==null
|| !StringUtils.equals(response.getCode(), CRMConstants.CODE_SUCCESS)
|| response.getData() ==null
|| response.getData().size() ==0){
hasMore = false;
+ }else{
+ allList.addAll(response.getData());
+ currentNum += response.getTotal();
}
if(currentNum >= response.getTotal()){
hasMore = false;
}
- dealSyncDataBiz(cdate,response.getData());
}catch (Exception e){
hasMore = false;
}
}
+ dealSyncDataBiz(cdate,allList);
}
private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
+ if(list ==null && list.size()==0){
+ return;
+ }
List<CustomerUser> addList = new ArrayList<>();
List<String> phoneList = new ArrayList<>();
for(CRMDaogouBindListResponse data : list){
@@ -254,6 +260,7 @@
model.setZtStatus(Constants.ONE);
model.setZtInfo("crm鍚屾");
model.setIamUserId(data.getUserId());
+ model.setMemberId(member==null?null:member.getId());
model.setUserId(user== null?null:user.getId());
model.setCreationDate(data.getCreationDate());
addList.add(model);
--
Gitblit v1.9.3