wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交人：陈绍鑫 

日期：2025/01/09 17：30
内容:推送共享优化
This commit is contained in:
陈绍鑫 2026-01-16 10:14:45 +08:00
parent 7047a7009a
commit 57a81b8273
2 changed files with 128 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/tsgxApiMappingBillPlugin.java
View File

@ -49,24 +49,29 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
String shkd_jrrzxx = shkd_apimapping.getString("shkd_jrrzxx");//记录日志选项
DynamicObject shkd_sourcebill = shkd_apimapping.getDynamicObject("shkd_sourcebill");
sourcebillnumber = shkd_sourcebill.getString("number");
String shkd_djlxbm = shkd_apimapping.getString("shkd_djlxbm");//接口类型
QFilter dzhdqFilter = null;
//要推送单据的默认过滤
if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细
if (shkd_djlxbm.equals("交易明细推送")) {//交易明细
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
} else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
} else if (shkd_djlxbm.equals("电子回单推送")) {//电子回单
dzhdqFilter = new QFilter("ismatch", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("bei_bankbalance")) {//账号余额
dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false);
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("cas_paybill")) {//付款处理
dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false);
} else if (shkd_djlxbm.equals("余额查询推送")) {//账号余额
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
} else if (shkd_djlxbm.equals("主动付款单推送")) {//付款处理
dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0"));//浪潮推送状态为空或推送失败
dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
dzhdqFilter = dzhdqFilter.and(new QFilter("paymentidentify.number", QCP.equals, "FKBS01"));
dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A")));
} else {
} else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理
dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功
dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D")));
}else {
this.getView().showTipNotification("未找到匹配的单据类型");
return;
}
@ -122,21 +127,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -153,21 +158,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -187,21 +192,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -222,21 +227,21 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -272,4 +277,38 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
this.getView().showTipNotification("功能成功");
}
}
public void setSuccessValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){
switch (shkd_djlxbm){
case "交易明细推送":
case "电子回单推送":
case "余额查询推送":
case "主动付款单推送":
bei_elecreceipt.set("shkd_lctszt","1");//推送成功
break;
case "付款状态推送":
bei_elecreceipt.set("shkd_lctszt","2");//推送成功已同步付款状态
break;
default:
break;
}
}
public void setFailValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){
switch (shkd_djlxbm){
case "交易明细推送":
case "电子回单推送":
case "余额查询推送":
case "主动付款单推送":
bei_elecreceipt.set("shkd_lctszt","0");//推送失败
break;
case "付款状态推送":
bei_elecreceipt.set("shkd_lctszt","3");//推送成功同步付款状态失败
break;
default:
break;
}
}
}

88
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java
View File

@ -48,24 +48,29 @@ public class SharePushTaskPlugin extends AbstractTask {
DynamicObject shkd_apimapping = BusinessDataServiceHelper.loadSingle(shkd_apimappingid.getLong("id"), "shkd_apimapping");
String shkd_jrrzxx = shkd_apimapping.getString("shkd_jrrzxx");//记录日志选项
DynamicObject shkd_sourcebill = shkd_apimapping.getDynamicObject("shkd_sourcebill");
String shkd_djlxbm = shkd_apimapping.getString("shkd_djlxbm");//接口类型
sourcebillnumber = shkd_sourcebill.getString("number");
QFilter dzhdqFilter = null;
//要推送单据的默认过滤
if (sourcebillnumber.equals("bei_transdetail_cas")) {//交易明细
if (shkd_djlxbm.equals("交易明细推送")) {//交易明细
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
} else if (sourcebillnumber.equals("bei_elecreceipt")) {//电子回单
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
} else if (shkd_djlxbm.equals("电子回单推送")) {//电子回单
dzhdqFilter = new QFilter("ismatch", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_sfcgtsgx", QCP.equals, false));
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("bei_bankbalance")) {//账号余额
dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false);
dzhdqFilter = dzhdqFilter.and(new QFilter("company.shkd_sfjcgx", QCP.equals, true));
} else if (sourcebillnumber.equals("cas_paybill")) {//付款处理
dzhdqFilter = new QFilter("shkd_sfcgtsgx", QCP.equals, false);
} else if (shkd_djlxbm.equals("余额查询推送")) {//账号余额
dzhdqFilter = new QFilter("company.shkd_sfjcgx", QCP.equals, true);
dzhdqFilter = dzhdqFilter.and(new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0")));//浪潮推送状态为空或推送失败
} else if (shkd_djlxbm.equals("主动付款单推送")) {//付款处理
dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "").or(new QFilter("shkd_lctszt", QCP.equals, "0"));//浪潮推送状态为空或推送失败
dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
dzhdqFilter = dzhdqFilter.and(new QFilter("paymentidentify.number", QCP.equals, "FKBS01"));
dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("A")));
} else if (shkd_djlxbm.equals("付款状态推送")) {//付款处理
dzhdqFilter=new QFilter("shkd_lctszt", QCP.equals, "1");//浪潮推送状态推送成功
dzhdqFilter = dzhdqFilter.and(new QFilter("org.shkd_sfjcgx", QCP.equals, true));
dzhdqFilter = dzhdqFilter.and(new QFilter("billstatus", QCP.in, Arrays.asList("D")));
} else {
logger.info("未找到匹配的单据类型");
return;
@ -122,21 +127,21 @@ public class SharePushTaskPlugin extends AbstractTask {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -153,21 +158,21 @@ public class SharePushTaskPlugin extends AbstractTask {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -187,21 +192,21 @@ public class SharePushTaskPlugin extends AbstractTask {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -222,21 +227,21 @@ public class SharePushTaskPlugin extends AbstractTask {
String flag = otherIsJsonRS.getString("flag");
if (resError(flag)) {//失败
resultMap.put("shkd_issuccess", false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", false);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
JSONArray datas = otherIsJsonRS.getJSONArray("data");
if (datas == null) {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
} 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);
setFailValue(bei_elecreceipt,shkd_djlxbm);
} else {
resultMap.put("shkd_issuccess", true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx", true);
setSuccessValue(bei_elecreceipt,shkd_djlxbm);
}
}
}
@ -271,4 +276,37 @@ public class SharePushTaskPlugin extends AbstractTask {
}
}
public void setSuccessValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){
switch (shkd_djlxbm){
case "交易明细推送":
case "电子回单推送":
case "余额查询推送":
case "主动付款单推送":
bei_elecreceipt.set("shkd_lctszt","1");//推送成功
break;
case "付款状态推送":
bei_elecreceipt.set("shkd_lctszt","2");//推送成功已同步付款状态
break;
default:
break;
}
}
public void setFailValue(DynamicObject bei_elecreceipt,String shkd_djlxbm){
switch (shkd_djlxbm){
case "交易明细推送":
case "电子回单推送":
case "余额查询推送":
case "主动付款单推送":
bei_elecreceipt.set("shkd_lctszt","0");//推送失败
break;
case "付款状态推送":
bei_elecreceipt.set("shkd_lctszt","3");//推送成功同步付款状态失败
break;
default:
break;
}
}
}