From 267928f61ecc1d4dbeeee76f2d2d868a209dae74 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 11:13:37 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java | 6 ++++--
server/web/src/main/java/com/doumee/api/web/CustomerApi.java | 6 ++++--
server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java | 2 +-
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java | 3 +--
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java | 8 ++++----
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
index 6d6d882..f8babe7 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/ZbomCRMService.java
@@ -20,7 +20,7 @@
@Service
public interface ZbomCRMService {
- int dealCustomerLogData(CustomerLog customerLog);
+ void dealCustomerLogData(CustomerLog customerLog);
String zbomEncode(String str);
String getCrmGoUrl(String userName,Integer type);
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
index 0c73d21..125032f 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java
@@ -53,7 +53,7 @@
*/
@Override
@Async
- public int dealCustomerLogData(CustomerLog customerLog){
+ public void dealCustomerLogData(CustomerLog customerLog){
CrmCustomerInfoRequest entity = new CrmCustomerInfoRequest();
entity.setId(customerLog.getId());
entity.setName(customerLog.getName());
@@ -91,7 +91,6 @@
.set(CustomerLog::getCrmStatus,Constants.ONE )
.set(CustomerLog::getCrmInfo,crmInfo )
.set(CustomerLog::getCrmDate,new Date() ));// 鏇存柊鐘舵��
- return status;// 榛樿澶辫触
}
/**
* 鑾峰彇瀵艰喘缁戝畾鍒楄〃
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
index ba905a5..8cd7b87 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
@@ -11,21 +11,21 @@
/**
* 璁板綍鍒楄〃
*/
- @JsonAlias(value = {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
+ @JsonAlias( {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
private List<T> records;
/**
* 褰撳墠椤�
*/
- @JsonAlias(value = {"pageCount","pageNum"})
+ @JsonAlias( {"pageCount","pageNum"})
private String pageNum;
/**
* 姣忛〉鏉℃暟
*/
- @JsonAlias(value = {"pageSize",})
+ @JsonAlias( {"pageSize",})
private String pageSize;
/**
* 鎬绘暟
*/
- @JsonAlias(value = {"totalCount","total"})
+ @JsonAlias( {"totalCount","total"})
private String total;
}
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..a166c77 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,25 +200,27 @@
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;
+ 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) {
diff --git a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
index e8908cb..f3dfd5f 100644
--- a/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/CustomerApi.java
@@ -69,6 +69,8 @@
@Autowired
private UsersService usersService;
+ @Autowired
+ private ZbomCRMService zbomCRMService;
@Autowired
private CustomerUserService customerUserService;
@@ -167,7 +169,7 @@
public ApiResponse saveRenovationCalculator(@RequestBody RenovationCalculatorDTO renovationCalculatorDTO) {
renovationCalculatorDTO.setMemberId(getMemberId());
CustomerLog customerLog =customerService.saveRenovationCalculator(renovationCalculatorDTO);
-// zbomCRMService.dealCustomerLogData(customerLog);
+ zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -181,7 +183,7 @@
public ApiResponse saveFreeCustomizationApply(@RequestBody FreeCustomizationDTO freeCustomizationDTO) {
freeCustomizationDTO.setMemberId(getMemberId());
CustomerLog customerLog = customerService.saveFreeCustomizationApply(freeCustomizationDTO);
-// zbomCRMService.dealCustomerLogData(customerLog);
+ zbomCRMService.dealCustomerLogData(customerLog);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3