|
|
@@ -419,9 +419,25 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
if (CollectionUtils.isEmpty(md5ListSXRKX)) {
|
|
|
return;
|
|
|
}
|
|
|
+ int sid=81;
|
|
|
+ int brand=43;
|
|
|
+ String key="730969D3F673BA42432C574378B9A8F1";
|
|
|
sendGetRequestSXRKX(commercialCallBackReadyEnum.getCode(),
|
|
|
- commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),resultMap);
|
|
|
+ commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),resultMap,sid, brand, key,"山西瑞凯鑫");
|
|
|
break;
|
|
|
+ case Commercial_BJXYR:
|
|
|
+ List<String> md5ListBJXYR = callBackMap.get(productBizId);
|
|
|
+ log.info("开始处理机构id:{},北京兴易容 当日订单数:{},条数:{}", productBizId,md5ListBJXYR,md5ListBJXYR.size());
|
|
|
+ if (CollectionUtils.isEmpty(md5ListBJXYR)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ int sidBJXYR=81;
|
|
|
+ int brandBJXYR=11;
|
|
|
+ String keyBJXYR="730969D3F673BA42432C574378B9A8F1";
|
|
|
+ sendGetRequestSXRKX(commercialCallBackReadyEnum.getCode(),
|
|
|
+ commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),resultMap,sidBJXYR, brandBJXYR, keyBJXYR,"北京兴易容");
|
|
|
+ break;
|
|
|
+
|
|
|
// case Commercial_XJZZ:
|
|
|
// List<String> md5ListXJZZ = callBackMap.get(busiId);
|
|
|
// log.info("开始处理机构id:{},当日订单数:{},条数:{}", busiId,md5ListXJZZ,md5ListXJZZ.size());
|
|
|
@@ -610,9 +626,9 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- private void sendGetRequestSXRKX(String productBizId,String busiId,String url,Map<String, String> resultMap){
|
|
|
- JSONObject param = SignUtil.generateSign(81, 43, "730969D3F673BA42432C574378B9A8F1");
|
|
|
- log.info("busiId:{},:山西瑞凯鑫 url:{} ,jsonString:{}" ,busiId, url,param);
|
|
|
+ private void sendGetRequestSXRKX(String productBizId,String busiId,String url,Map<String, String> resultMap,int sid, int brand, String key,String companyName){
|
|
|
+ JSONObject param = SignUtil.generateSign(sid, brand, key);
|
|
|
+ log.info("busiId:{},:{} url:{} ,jsonString:{}" ,busiId,companyName, url,param);
|
|
|
String responseStr = HttpClientThreeUtil.post(url, JSON.toJSONString(param));
|
|
|
JSONObject jsonObject = JSON.parseObject(responseStr);
|
|
|
List<CustomerFollowup> followupList = new ArrayList<>();
|
|
|
@@ -620,7 +636,7 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
JSONObject data = jsonObject.getJSONObject("data");
|
|
|
JSONArray list = data.getJSONArray("list");
|
|
|
if (CollectionUtils.isEmpty(list)) {
|
|
|
- log.info("busiId:{} 山西瑞凯鑫 list为空 没有星级数据", busiId);
|
|
|
+ log.info("busiId:{}:{} list为空 没有星级数据", busiId,companyName);
|
|
|
return;
|
|
|
}
|
|
|
String s = resultMap.get(busiId);
|
|
|
@@ -633,7 +649,7 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
customerFollowup.setCustomerName(item.getString("name"));
|
|
|
String stars = object.getString("stars");
|
|
|
if (StringUtils.isEmpty(stars)) {
|
|
|
- log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, "山西瑞凯鑫" ,customerFollowup.getPhoneMd5());
|
|
|
+ log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, companyName,customerFollowup.getPhoneMd5());
|
|
|
continue;
|
|
|
}else {
|
|
|
if (StringUtils.isEmpty(s)){
|
|
|
@@ -658,7 +674,7 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
customerFollowup.setFollowRemark(item.getString("remark"));
|
|
|
String mobile = item.getString("mobile");
|
|
|
if (StringUtils.isEmpty(mobile)) {
|
|
|
- log.error("busiId:{} 山西瑞凯鑫 手机号为空",busiId);
|
|
|
+ log.error("busiId:{} :{} 手机号为空",busiId,companyName);
|
|
|
continue;
|
|
|
}
|
|
|
customerFollowup.setPhoneMd5(DigestUtils.md5Hex(mobile));
|
|
|
@@ -667,10 +683,10 @@ public class CasllBackDataProcessor implements CallBackService {
|
|
|
}
|
|
|
}
|
|
|
if (CollectionUtils.isEmpty(followupList)) {
|
|
|
- log.info("busiId:{} 山西瑞凯鑫 无星级数据", busiId);
|
|
|
+ log.info("busiId:{} :{} 无星级数据", busiId,companyName);
|
|
|
return;
|
|
|
}
|
|
|
- log.info("busiId:{} 山西瑞凯鑫 处理数据条:{}", busiId, followupList.size());
|
|
|
+ log.info("busiId:{} :{} 处理数据条:{}", busiId, companyName,followupList.size());
|
|
|
handleMappedData(busiId,followupList);
|
|
|
}
|
|
|
private void sendGetRequestCQYXJ(String productBizId,String busiId,String url,List<String> md5ListCQYXJ,String accessKey,Integer channelType,Map<String, String> resultMap){
|