1

src/main/java/com/tiangua/star/service/impl/CasllBackDataProcessor.java

@@ -94,8 +94,7 @@ public class CasllBackDataProcessor implements CallBackService {
                         String channelTypeLSDJ="21180";
                         String accessKeyLSDJ="04F9A42A-A240-4CAB-84ED-530C54091341";
                         sendGetRequestGZWA(commercialCallBackReadyEnum.getCode(),
-                                commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),channelTypeLSDJ,accessKeyLSDJ,"乐山都聚财信息技术咨询有限公司",md5ListLSDJ
-                        );
+                                commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),channelTypeLSDJ,accessKeyLSDJ,"乐山都聚财信息技术咨询有限公司",md5ListLSDJ,resultMap);
                         break;
                     case Commercial_SCNAZC://四川诺安至诚信息科技有限公司
                         List<String> md5ListSCNAZC = callBackMap.get(productBizId);
@@ -117,7 +116,7 @@ public class CasllBackDataProcessor implements CallBackService {
                         String channelTypeSCNA="21180";
                         String accessKeySCNA="9F417567-6A56-41F6-BD9B-D86DB92C5661";
                         sendGetRequestGZWA(commercialCallBackReadyEnum.getCode(),
-                                commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),channelTypeSCNA,accessKeySCNA,"四川诺安至诚信息科技有限公司",md5ListSCNA);
+                                commercialCallBackReadyEnum.getBusid(),commercialCallBackReadyEnum.getUrl(),channelTypeSCNA,accessKeySCNA,"四川诺安至诚信息科技有限公司",md5ListSCNA,resultMap);
                         break;
                     case Commercial_GZWA://广州维安信息咨询有限公司
                         List<String> md5ListGZWA = callBackMap.get(productBizId);
@@ -527,7 +526,7 @@ public class CasllBackDataProcessor implements CallBackService {
                     log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, "山西瑞凯鑫" ,customerFollowup.getPhoneMd5());
                     continue;
                 }else {
-                    if (s==null){
+                    if (StringUtils.isEmpty(s)){
                         customerFollowup.setStarLevel(new BigDecimal(stars));
                     }else {
                         Map<String, String> starMap = JSON.parseObject(object.toString(), Map.class);
@@ -595,7 +594,7 @@ public class CasllBackDataProcessor implements CallBackService {
                 log.info("busiId:{} 重庆优兴嘉 mobile_md5{} 没有填星级:", busiId, followup.getPhoneMd5());
                 continue;
             } else {
-                if (s==null){//没有配置映射
+                if (StringUtils.isEmpty(s)){//没有配置映射
                     if ("0".equals(star)) {
                         followup.setStarLevel(new BigDecimal(0));
                     } else if ("10".equals(star)) {
@@ -695,7 +694,7 @@ public class CasllBackDataProcessor implements CallBackService {
                 log.info("busiId:{} 江西聚金阁 mobile_md5{} 没有填星级:", busiId, followup.getPhoneMd5());
                 continue;
             } else {
-                if (s==null){
+                if (StringUtils.isEmpty(s)){
                     if ("0".equals(star)) {
                         followup.setStarLevel(new BigDecimal(0));
                     } else if ("1".equals(star)) {
@@ -783,7 +782,7 @@ public class CasllBackDataProcessor implements CallBackService {
                 log.info("busiId:{} 佛山创智盈通企业管理有限公司 mobile_md5{} 没有填星级:", busiId, followup.getPhoneMd5());
                 continue;
             } else {
-                if (s==null){
+                if (StringUtils.isEmpty(s)){
                     if ("0星".equals(star)) {
                         followup.setStarLevel(new BigDecimal(0));
                     } else if ("1星".equals(star)) {
@@ -935,7 +934,7 @@ public class CasllBackDataProcessor implements CallBackService {
                 log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, companyName ,followup.getPhoneMd5());
                 continue;
             } else {
-                if (s==null){//没有配置映射
+                if (StringUtils.isEmpty(s)){//没有配置映射
                     if ("0".equals(star)) {
                         followup.setStarLevel(new BigDecimal(0));
                     } else if ("10".equals(star)) {
@@ -1017,7 +1016,7 @@ public class CasllBackDataProcessor implements CallBackService {
                 log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, companyName ,followup.getPhoneMd5());
                 continue;
             }else {
-                if (s==null){
+                if (StringUtils.isEmpty(s)){
                     followup.setStarLevel(new BigDecimal(stars));
                 }else {
                     Map<String, String> starMap = JSON.parseObject(jsonObject.toString(), Map.class);

src/main/java/com/tiangua/star/service/impl/XinLuDataProcessor.java

@@ -185,6 +185,7 @@ public class XinLuDataProcessor implements XinLuService {
                 .map(obj -> {
                     JSONObject item = (JSONObject) obj;
                     XinLuUserStarCallbackParam param = new XinLuUserStarCallbackParam();
+                    //String businessId = "5443c0b724b0241022045948business";
                     String s = resultMap.get(busiId);
                     JSONObject object = JSON.parseObject(s);
                     // 基础字段映射
@@ -195,7 +196,7 @@ public class XinLuDataProcessor implements XinLuService {
                     if (StringUtils.isEmpty(stars)) {
                         log.info("busiId:{} companyName {}, mobile_md5{} 没有填星级:", busiId, "山西瑞凯鑫" ,param.getMaskPhone());
                     }else {
-                        if (s==null){
+                        if (StringUtils.isEmpty(s)){
                             param.setStarLevel(new Float(stars));
                         }else {
                             Map<String, String> starMap = JSON.parseObject(object.toString(), Map.class);