From c3f760c9acc3fe46e4c13a48295518c0f67cc42d Mon Sep 17 00:00:00 2001 From: csx <1981897232@qq.com> Date: Wed, 7 Jan 2026 09:41:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=99=88=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/0?= =?UTF-8?q?1/06=2011=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=85=AC=E4=BA=AB=E9=99=84=E4=BB=B6=E5=B7=A5=E5=85=B7=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/tsgxApiMappingBillPlugin.java | 19 ++++++++++++------- .../sys/plugin/task/SharePushTaskPlugin.java | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index 2fc485a..cc4fbf7 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -124,19 +124,24 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败 + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { + if (datas==null){ resultMap.put("shkd_issuccess",true);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } } } break; diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 9ce450f..93364a7 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -119,18 +119,23 @@ public class SharePushTaskPlugin extends AbstractTask { res = doPost(shkd_url,headMap,saveRequestBody,null); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败 + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 }else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { + if (datas==null){ resultMap.put("shkd_issuccess",true);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } } } break; From cac859d2e24491f0c8fb827950b2fe0ec9548021 Mon Sep 17 00:00:00 2001 From: csx <1981897232@qq.com> Date: Wed, 7 Jan 2026 10:11:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?= =?UTF-8?q?=E9=99=88=E7=BB=8D=E9=91=AB=20=E6=97=A5=E6=9C=9F=EF=BC=9A2025/0?= =?UTF-8?q?1/07=2011=EF=BC=9A30=20=E5=86=85=E5=AE=B9:=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/tsgxApiMappingBillPlugin.java | 125 +++++++++++++----- .../sys/plugin/task/SharePushTaskPlugin.java | 120 ++++++++++++----- 2 files changed, 175 insertions(+), 70 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index cc4fbf7..708b957 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -109,50 +109,101 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } DynamicObjectCollection shkd_mapping = shkd_apimapping.getDynamicObjectCollection("shkd_mapping"); + for (DynamicObject bei_elecreceiptid : bei_elecreceiptids) { DynamicObject bei_elecreceipt = BusinessDataServiceHelper.loadSingle(bei_elecreceiptid.getLong("id"), sourcebillnumber); String saveRequestBody=getJSON(bei_elecreceipt,shkd_mapping);//请求json logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json："+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - switch (shkd_jrrzxx){ - case "1": - case "2": - case "3": - case "4": - res = doPost(shkd_url,headMap,saveRequestBody,null); - logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); - JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 - String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - JSONArray datas = otherIsJsonRS.getJSONArray("data"); - if (datas==null){ - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - }else { - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - } - } - } - break; - case "5": - res=""; + if ("1".equals(shkd_jrrzxx)){ + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); - break; - default: - System.out.println("无效的选项"); - break; + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + } else if ("2".equals(shkd_jrrzxx)) {//只记录失败的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + continue; + } + }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + }else { + continue; + } + }else if ("4".equals(shkd_jrrzxx)) {//不记录 + continue; + }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 + resultMap.put("shkd_issuccess",false);//是否成功 + }else { + continue; } logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json："+res); @@ -512,4 +563,6 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { Object[] save = SaveServiceHelper.save(new DynamicObject[]{dynamicObject}); return save; } + + } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 93364a7..8034c3c 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -111,42 +111,94 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json："+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - switch (shkd_jrrzxx){ - case "1": - case "2": - case "3": - case "4": - res = doPost(shkd_url,headMap,saveRequestBody,null); - JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 - String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 - resultMap.put("shkd_issuccess",false);//是否成功 - }else { - JSONArray datas = otherIsJsonRS.getJSONArray("data"); - if (datas==null){ - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - }else { - JSONObject data = datas.getJSONObject(0); - String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ - resultMap.put("shkd_issuccess",false);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",false); - }else { - resultMap.put("shkd_issuccess",true);//是否成功 - bei_elecreceipt.set("shkd_sfcgtsgx",true); - } - } - } - break; - case "5": - res=""; + if ("1".equals(shkd_jrrzxx)){ + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); - break; - default: - System.out.println("无效的选项"); - break; + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + } else if ("2".equals(shkd_jrrzxx)) {//只记录失败的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + continue; + } + }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + if ((Boolean) resultMap.get("shkd_issuccess")){ + }else { + continue; + } + }else if ("4".equals(shkd_jrrzxx)) {//不记录 + continue; + }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 + resultMap.put("shkd_issuccess",false);//是否成功 + }else { + continue; } logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json："+res); From 073ba84f47a7a3f3d1efd5ae2a3e157f2229a47b Mon Sep 17 00:00:00 2001 From: "1981897232@qq.com" <1981897232@qq> Date: Wed, 7 Jan 2026 10:35:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9Acsx=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=EF=BC=9A2025=E5=B9=B401?= =?UTF-8?q?=E6=9C=8806=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E9=93=BE=E6=8E=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/tsgxApiMappingBillPlugin.java | 19 +++++++++++------- .../sys/plugin/task/SharePushTaskPlugin.java | 20 +++++++++++++------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index 708b957..80b69b3 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -121,7 +121,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -132,7 +132,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -146,7 +146,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -157,7 +157,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -174,7 +174,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -185,7 +185,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -564,5 +564,10 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { return save; } - + /* + * 检查是否失败的结果 + * */ + private Boolean resError(String flag){ + return "0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag); + } } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 8034c3c..cee8de5 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -116,7 +116,7 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -127,7 +127,7 @@ public class SharePushTaskPlugin extends AbstractTask { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -141,7 +141,7 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -152,7 +152,7 @@ public class SharePushTaskPlugin extends AbstractTask { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -169,7 +169,7 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 String flag = otherIsJsonRS.getString("flag"); - if ("0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag)){//失败 + if (resError(flag)){//失败 resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -180,7 +180,7 @@ public class SharePushTaskPlugin extends AbstractTask { }else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); - if ("0".equals(dataflag)||"null".equals(dataflag)||dataflag==null){ + if (resError(dataflag)){ resultMap.put("shkd_issuccess",false);//是否成功 bei_elecreceipt.set("shkd_sfcgtsgx",false); }else { @@ -554,4 +554,12 @@ public class SharePushTaskPlugin extends AbstractTask { Object[] save = SaveServiceHelper.save(new DynamicObject[]{dynamicObject}); return save; } + + /* + * 检查是否失败的结果 + * */ + private Boolean resError(String flag){ + return "0".equals(flag)||"null".equals(flag)||flag==null||"false".equals(flag); + } + } From c670b89731aa716531d64661e02084ada5152885 Mon Sep 17 00:00:00 2001 From: "1981897232@qq.com" <1981897232@qq> Date: Wed, 7 Jan 2026 11:49:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9Acsx=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=EF=BC=9A2025=E5=B9=B401?= =?UTF-8?q?=E6=9C=8806=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E9=93=BE=E6=8E=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/form/tsgxApiMappingBillPlugin.java | 46 +++++++++++++++---- .../sys/plugin/task/SharePushTaskPlugin.java | 46 +++++++++++++++---- 2 files changed, 72 insertions(+), 20 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index 80b69b3..e473b51 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -116,7 +116,8 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json："+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - if ("1".equals(shkd_jrrzxx)){ + Boolean tiaoguo =false; + if ("1".equals(shkd_jrrzxx)){//记录所有 res = doPost(shkd_url,headMap,saveRequestBody,null); logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 @@ -167,7 +168,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } } if ((Boolean) resultMap.get("shkd_issuccess")){ - continue; + tiaoguo=true; } }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 res = doPost(shkd_url,headMap,saveRequestBody,null); @@ -196,26 +197,51 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } if ((Boolean) resultMap.get("shkd_issuccess")){ }else { - continue; + tiaoguo=true; } }else if ("4".equals(shkd_jrrzxx)) {//不记录 - continue; + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if (resError(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if (resError(dataflag)){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + tiaoguo=true; }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 resultMap.put("shkd_issuccess",false);//是否成功 }else { - continue; + break; } - logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json："+res); resultMap.put("shkd_requesturl",shkd_url);//请求地址 resultMap.put("shkd_request",saveRequestBody);//请求体 resultMap.put("shkd_response",res);//响应数据 resultMap.put("shkd_thirdpartysys","浪潮");//第三方系统 resultMap.put("shkd_calldescription","司库->浪潮");//第三方系统 - - DynamicObject[] objects = (DynamicObject[]) saveThePushLog(resultMap); - String billno = objects[0].getString("billno");//对应日志编号 - bei_elecreceipt.set("shkd_tsgxrzwybs",billno);//推送共享日志唯一标识 + logger.info("resultMap:"+resultMap); + if (!tiaoguo){ + DynamicObject[] objects = (DynamicObject[]) saveThePushLog(resultMap); + String billno = objects[0].getString("billno");//对应日志编号 + bei_elecreceipt.set("shkd_tsgxrzwybs",billno);//推送共享日志唯一标识 + } bei_elecreceipt.set("shkd_tsgxrtime",new Date());//推送共享时间 SaveServiceHelper.update(bei_elecreceipt); } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index cee8de5..2a8be69 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -111,7 +111,8 @@ public class SharePushTaskPlugin extends AbstractTask { logger.info("单据"+bei_elecreceipt.getString("billno")+"推送json："+saveRequestBody); Map resultMap = new HashMap<>(); String res=""; - if ("1".equals(shkd_jrrzxx)){ + Boolean tiaoguo =false; + if ("1".equals(shkd_jrrzxx)){//记录所有 res = doPost(shkd_url,headMap,saveRequestBody,null); logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 @@ -162,7 +163,7 @@ public class SharePushTaskPlugin extends AbstractTask { } } if ((Boolean) resultMap.get("shkd_issuccess")){ - continue; + tiaoguo=true; } }else if ("3".equals(shkd_jrrzxx)) {//只记录成功的 res = doPost(shkd_url,headMap,saveRequestBody,null); @@ -191,26 +192,51 @@ public class SharePushTaskPlugin extends AbstractTask { } if ((Boolean) resultMap.get("shkd_issuccess")){ }else { - continue; + tiaoguo=true; } }else if ("4".equals(shkd_jrrzxx)) {//不记录 - continue; + res = doPost(shkd_url,headMap,saveRequestBody,null); + logger.info("单据"+bei_elecreceipt.getString("billno")+"返回信息："+res); + JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果 + String flag = otherIsJsonRS.getString("flag"); + if (resError(flag)){//失败 + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + JSONArray datas = otherIsJsonRS.getJSONArray("data"); + if (datas==null){ + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + }else { + JSONObject data = datas.getJSONObject(0); + String dataflag = data.getString("FLAG"); + if (resError(dataflag)){ + resultMap.put("shkd_issuccess",false);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",false); + }else { + resultMap.put("shkd_issuccess",true);//是否成功 + bei_elecreceipt.set("shkd_sfcgtsgx",true); + } + } + } + tiaoguo=true; }else if ("5".equals(shkd_jrrzxx)) {//只记录不推送 resultMap.put("shkd_issuccess",false);//是否成功 }else { - continue; + break; } - logger.info("单据"+bei_elecreceipt.getString("billno")+"返回json："+res); resultMap.put("shkd_requesturl",shkd_url);//请求地址 resultMap.put("shkd_request",saveRequestBody);//请求体 resultMap.put("shkd_response",res);//响应数据 resultMap.put("shkd_thirdpartysys","浪潮");//第三方系统 resultMap.put("shkd_calldescription","司库->浪潮");//第三方系统 - - DynamicObject[] objects = (DynamicObject[]) saveThePushLog(resultMap); - String billno = objects[0].getString("billno");//对应日志编号 - bei_elecreceipt.set("shkd_tsgxrzwybs",billno);//推送共享日志唯一标识 + logger.info("resultMap:"+resultMap); + if (!tiaoguo){ + DynamicObject[] objects = (DynamicObject[]) saveThePushLog(resultMap); + String billno = objects[0].getString("billno");//对应日志编号 + bei_elecreceipt.set("shkd_tsgxrzwybs",billno);//推送共享日志唯一标识 + } bei_elecreceipt.set("shkd_tsgxrtime",new Date());//推送共享时间 SaveServiceHelper.update(bei_elecreceipt); } From 77066ef2932288a4df88c9b5905bb419fc7f7db8 Mon Sep 17 00:00:00 2001 From: "1981897232@qq.com" <1981897232@qq> Date: Wed, 7 Jan 2026 15:48:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9Acsx=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4=EF=BC=9A2025=E5=B9=B401?= =?UTF-8?q?=E6=9C=8807=E6=97=A5=20=E6=8F=90=E4=BA=A4=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=9A=E6=8E=A8=E9=80=81=E5=85=B1=E4=BA=AB=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java | 6 +----- .../java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java index e473b51..e372fe2 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java @@ -492,11 +492,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { value = dynamicObjectCollection.get(0).getString(parts[1]); } } else if (shkd_djzdms.contains(".")) { - String[] parts = shkd_djzdms.split("\\."); - DynamicObject dynamicObject = bei_elecreceipt.getDynamicObject(parts[0]); - if (dynamicObject!=null){ - value = dynamicObject.getString(parts[1]); - } + value = bei_elecreceipt.getString(shkd_djzdms); }else { value = bei_elecreceipt.getString(shkd_djzdms); } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java index 2a8be69..3a0720d 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java @@ -483,11 +483,7 @@ public class SharePushTaskPlugin extends AbstractTask { value = dynamicObjectCollection.get(0).getString(parts[1]); } } else if (shkd_djzdms.contains(".")) { - String[] parts = shkd_djzdms.split("\\."); - DynamicObject dynamicObject = bei_elecreceipt.getDynamicObject(parts[0]); - if (dynamicObject!=null){ - value = dynamicObject.getString(parts[1]); - } + value = bei_elecreceipt.getString(shkd_djzdms); }else { value = bei_elecreceipt.getString(shkd_djzdms); }