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 0dba74d..e84ba78 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 @@ -133,21 +133,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -164,21 +164,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -198,21 +198,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -233,21 +233,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm,otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm,otherIsJsonRS); } } } @@ -284,13 +284,15 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } } - public void setSuccessValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){ + public void setSuccessValue(DynamicObject bei_elecreceipt, String shkd_djlxbm, JSONObject otherIsJsonRS){ switch (shkd_djlxbm){ case "交易明细推送": case "电子回单推送": case "余额查询推送": case "主动付款单推送": bei_elecreceipt.set("shkd_lctszt","1");//推送成功 + bei_elecreceipt.set("shkd_businessid",otherIsJsonRS.getString("docID"));//推送单据id + bei_elecreceipt.set("shkd_businessnumber",otherIsJsonRS.getString("docNo"));//推送单据编码 break; case "付款状态推送": bei_elecreceipt.set("shkd_lctszt","2");//推送成功已同步付款状态 @@ -301,7 +303,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn { } } - public void setFailValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){ + public void setFailValue(DynamicObject bei_elecreceipt, String shkd_djlxbm, JSONObject otherIsJsonRS){ switch (shkd_djlxbm){ case "交易明细推送": case "电子回单推送": 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 bf6fe87..08439de 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 @@ -129,21 +129,21 @@ public class SharePushTaskPlugin extends AbstractTask { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -160,21 +160,21 @@ public class SharePushTaskPlugin extends AbstractTask { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -194,21 +194,21 @@ public class SharePushTaskPlugin extends AbstractTask { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } } } @@ -229,21 +229,21 @@ public class SharePushTaskPlugin extends AbstractTask { String flag = otherIsJsonRS.getString("flag"); if (resError(flag)) {//失败 resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONArray datas = otherIsJsonRS.getJSONArray("data"); if (datas == null) { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm, otherIsJsonRS); } else { JSONObject data = datas.getJSONObject(0); String dataflag = data.getString("FLAG"); if (resError(dataflag)) { resultMap.put("shkd_issuccess", false);//是否成功 - setFailValue(bei_elecreceipt,shkd_djlxbm); + setFailValue(bei_elecreceipt,shkd_djlxbm,otherIsJsonRS); } else { resultMap.put("shkd_issuccess", true);//是否成功 - setSuccessValue(bei_elecreceipt,shkd_djlxbm); + setSuccessValue(bei_elecreceipt,shkd_djlxbm,otherIsJsonRS); } } } @@ -278,13 +278,15 @@ public class SharePushTaskPlugin extends AbstractTask { } } - public void setSuccessValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){ + public void setSuccessValue(DynamicObject bei_elecreceipt, String shkd_djlxbm, JSONObject otherIsJsonRS){ switch (shkd_djlxbm){ case "交易明细推送": case "电子回单推送": case "余额查询推送": case "主动付款单推送": bei_elecreceipt.set("shkd_lctszt","1");//推送成功 + bei_elecreceipt.set("shkd_businessid",otherIsJsonRS.getString("docID"));//推送单据id + bei_elecreceipt.set("shkd_businessnumber",otherIsJsonRS.getString("docNo"));//推送单据编码 break; case "付款状态推送": bei_elecreceipt.set("shkd_lctszt","2");//推送成功已同步付款状态 @@ -295,7 +297,7 @@ public class SharePushTaskPlugin extends AbstractTask { } } - public void setFailValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){ + public void setFailValue(DynamicObject bei_elecreceipt, String shkd_djlxbm, JSONObject otherIsJsonRS){ switch (shkd_djlxbm){ case "交易明细推送": case "电子回单推送":