From de70d21d8dea3e8ae972722456e3e8223a798ae5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 12 七月 2024 18:26:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/biz/zbom/impl/ZbomCRMServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
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 917c171..f6d1d27 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
@@ -6,6 +6,7 @@
import com.doumee.biz.zbom.model.CrmCustomerInfoModel;
import com.doumee.biz.zbom.model.CrmCustomerSubmmitModel;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.dao.business.CrmInterfaceLogMapper;
import com.doumee.dao.business.CustomerLogMapper;
@@ -36,6 +37,30 @@
@Autowired
private RedisTemplate<String, Object> redisTemplate;
+
+ @Override
+ @Async
+ public void dealCustomerLogData(CustomerLog customerLog){
+ CrmCustomerSubmmitModel entity = new CrmCustomerSubmmitModel();
+ List<CrmCustomerInfoModel> cusInfo = new ArrayList();
+ CrmCustomerInfoModel crmCustomerInfoModel = new CrmCustomerInfoModel();
+ crmCustomerInfoModel.setId(customerLog.getId());
+ crmCustomerInfoModel.setName(customerLog.getName());
+ crmCustomerInfoModel.setPhone(customerLog.getPhone());
+ crmCustomerInfoModel.setAreaname(customerLog.getAreaName());
+ crmCustomerInfoModel.setAreacode(customerLog.getAreaCode());
+ crmCustomerInfoModel.setOpenid(customerLog.getOpenid());
+ crmCustomerInfoModel.setSource(Constants.CrmSources.SOURCE_ZBJX);
+ crmCustomerInfoModel.setChannel(crmCustomerInfoModel.getSource()+"00");
+ crmCustomerInfoModel.setDate(DateUtil.dateToString(customerLog.getCreateDate(),"yyyy/MM/dd HH:mm"));
+ cusInfo.add(crmCustomerInfoModel);
+ entity.setCusInfo(cusInfo);
+ this.postDataToCrm(entity);
+
+ }
+
+
+
/**
* 蹇楅偊瀹㈡埛淇℃伅鎻愪氦鎺ュ彛
* @param entity
@@ -51,16 +76,16 @@
String type = "postCusData";
String appid = (String) redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_KEY);
String urlStr = (String)redisTemplate.opsForValue().get(Constants.RedisKeys.ZBOM_CRM_API_URL) ;
-
long _t = System.currentTimeMillis();
String crmInfo="鎻愪氦澶辫触";
if (StringUtils.isNotBlank(appid)||StringUtils.isNotBlank(urlStr)) {
- String token = DigestUtils.md5Hex(type + _t + appid);
- String url = urlStr + "?type=" + type + "&_t=" + _t + "&token=" + token;// 鎻愪氦CRM鍦板潃
String param = JSONObject.toJSONString(entity);
- int success =1;
String result = null;
+ int success =1;
+ String url = urlStr;
try {
+ String token = DigestUtils.md5Hex(type + _t + appid);
+ url = urlStr + "?type=" + type + "&_t=" + _t + "&token=" + token;// 鎻愪氦CRM鍦板潃
result = HttpsUtil.postJson(url,param);
if (StringUtils.isNotBlank(result)) {
JSONObject r = JSONObject.parseObject(result.replace("(", "").replace(")", ""));
@@ -99,6 +124,7 @@
.set(CustomerLog::getCrmDate,new Date() ));// 鏇存柊鐘舵��
return status;// 榛樿澶辫触
}
+
public void saveInterfaceLog(String url,String name,String param,Integer success,String respone){
if(crmInterfaceLogMapper ==null){
return;
--
Gitblit v1.9.3