From fc16d01c27e94326e72f3ddf620b6de719a50723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=85=89=E8=B5=B7?= <1198568182@qq.com> Date: Wed, 4 Jun 2025 16:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KDTokenController.java | 2 +- .../ProjectNewOpportunityController.java | 4 ++-- .../controller/customerController.java | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java index d199c28..b63583d 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/KDTokenController.java @@ -213,7 +213,7 @@ public class KDTokenController { accessTokenParams.put("usertype", "Mobile"); accessTokenParams.put("apptoken", getKDAppTokenTest()); accessTokenParams.put("tenantid", "zyierp"); - accessTokenParams.put("accountId", "2095345516136108032"); + accessTokenParams.put("accountId", "2226057923279195136"); accessTokenParams.put("language", "zh_CN"); //开始向金蝶发起请求 diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java index 6ce3b87..62c8a6b 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/ProjectNewOpportunityController.java @@ -52,7 +52,7 @@ public class ProjectNewOpportunityController { ); - // List paramList = Arrays.asList(new CrmFXApiParam("EQ", "name", "集成测试-商机")); + // List paramList = Arrays.asList(new CrmFXApiParam("EQ", "name", "国网黑龙江省电力有限公司绥化供电公司可视化采购项目（测试）")); JSONObject jsonject = fxapi.getSynNewDataObj(false, "商机", apiName, paramList); JSONArray array = jsonject.getJSONObject("data").getJSONArray("dataList"); @@ -161,7 +161,7 @@ public class ProjectNewOpportunityController { //编码 datajson.put("number",number); - datajson.put("group_number","XM-03");//项目分类 + datajson.put("group_number","XM_03");//项目分类 datajson.put("name",nameData);//项目名称 datajson.put("f9w5_crmid",dataId);//CRMID datajson.put("enable","1");//使用状态 diff --git a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java index 630d7b8..b1ae29a 100644 --- a/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java +++ b/magic-boot/src/main/java/org/ssssssss/magicboot/controller/customerController.java @@ -29,8 +29,8 @@ public class customerController { static Logger log = LoggerFactory.getLogger("customer"); public static void main(String[] args) throws Exception { - new customerController().getSynDataAdd(); - new customerController().getSynKH(); + //new customerController().getSynDataAdd(); + new customerController().getSynKHUPdate(); } @@ -209,7 +209,7 @@ public class customerController { datajson.put("entry_linkman",lxrarr);//联系人 } - JSONArray groupstandardarr2 = new JSONArray(); + /* JSONArray groupstandardarr2 = new JSONArray(); JSONObject jsonjectC = fxapi.getSynDataObj("客户下财务信息", "AccountFinInfoObj", "account_id", dataId); JSONArray arrayC = jsonjectC.getJSONObject("data").getJSONArray("dataList"); if (!arrayC.isEmpty()){ @@ -228,7 +228,7 @@ public class customerController { groupstandardarr2.add(groupstandardjson2); } datajson.put("entry_bank",groupstandardarr2);//银行信息 - } + }*/ @@ -421,11 +421,12 @@ public class customerController { String account_no = GcjJson.getNodeValue(str, "JSON.account_no") != null ? GcjJson.getNodeValue(str, "JSON.account_no").toString() : ""; String erp_category__c = GcjJson.getNodeValue(str, "JSON.erp_category__c") != null ? GcjJson.getNodeValue(str, "JSON.erp_category__c").toString() : ""; + String endtime = GcjJson.getNodeValue(str, "JSON.last_modified_time") != null ? GcjJson.getNodeValue(str, "JSON.last_modified_time").toString() : ""; String strJson = ""; try{ JSONObject dataSyn = MagicApi.getSendSYNDataCustomer("KH", syn_type, dataId,"3"); - if (dataSyn != null && dataId.equals(dataSyn.getString("crmId"))) { + if (dataSyn != null && dataId.equals(dataSyn.getString("crmId")) && endtime.equals(dataSyn.getString("mark")) ) { log.info("数据已存在-" + nameData); XxlJobHelper.log("--数据已存在---" + nameData); tbflag = true; @@ -449,7 +450,7 @@ public class customerController { //编码 datajson.put("number",account_no); datajson.put("paymentcurrency_number","CNY");//付款币种.货币代码 - datajson.put("name","新-"+nameData);//客户名称 + datajson.put("name",nameData);//客户名称 datajson.put("f9w5_crmid",dataId);//CRMID // datajson.put("settlementtypeid_number","JSFS04");//结算方式 @@ -481,7 +482,7 @@ public class customerController { datajson.put("entry_linkman",lxrarr);//联系人 } - JSONArray groupstandardarr2 = new JSONArray(); + /*JSONArray groupstandardarr2 = new JSONArray(); JSONObject jsonjectC = fxapi.getSynDataObj("客户下财务信息", "AccountFinInfoObj", "account_id", dataId); JSONArray arrayC = jsonjectC.getJSONObject("data").getJSONArray("dataList"); if (!arrayC.isEmpty()){ @@ -500,7 +501,7 @@ public class customerController { groupstandardarr2.add(groupstandardjson2); } datajson.put("entry_bank",groupstandardarr2);//银行信息 - } + }*/ @@ -549,7 +550,7 @@ public class customerController { // paramMap.put("sync_status__c", "option_sync_failure__c"); paramMap.put("sync_info__c", "修改成功"); //回写json - fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); + // fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); }else{ sendFlag=true; @@ -558,7 +559,7 @@ public class customerController { // paramMap.put("sync_status__c", "option_sync_failure__c"); paramMap.put("sync_info__c", stringBuffer); //回写json - fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); + // fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); } } catch (Exception e) { sendFlag = true; @@ -567,13 +568,12 @@ public class customerController { //paramMap.put("sync_status__c", "option_sync_failure__c"); paramMap.put("sync_info__c", stringBuffer); //回写json - fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); + // fxapi.upSynFieldParam("", "AccountObj", dataId, paramMap); } JSONObject sendData = new JSONObject(); sendData.put("send_status", !sendFlag);//同步状态 true同步成功 false同步失败 3待同步 - sendData.put("send_id", str.getString("sendId")); //send_id MagicApi.updateSendSYUPDATEcustomer(sendData);