Merge remote-tracking branch 'origin/main'

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/mservice/ApiService.java

@@ -248,6 +248,18 @@ public class ApiService {
                 break;
             // 银行收付处理
             case "https://biptestctny.invest.com.cn:8002/iuap-api-auth/yonbip/ctm/cmp/bankReconciliationBatchSave":
+                saveResponseBody = pushBill(token, saveUrl, saveRequestBody);
+                jsonObject = JSON.parseObject(saveResponseBody);
+                code = jsonObject.getString("code");
+                if ("200".equals(code)) {
+                    dynamic.set("shkd_pushstatus", "已推送");
+                    dynamicObjects.add(dynamic);
+                    logger.info("银行收付处理 → BIP推送接口 → 成功\n成功单据编号：{}\n成功请求体：{}\n推送成功接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
+                    result = "推送 → 银行收付处理 → 成功";
+                } else {
+                    logger.info("银行收付处理 → BIP推送接口 → 失败\n失败单据编号：{}\n失败请求体：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
+                    result = "推送 → 银行收付处理 → 失败";
+                }
                 break;
             // 支付结果
             case "https://biptestctny.invest.com.cn:8002/iuap-api-auth/yonbip/ctm/api/settlement/feedback":
@@ -273,6 +285,20 @@ public class ApiService {
                     result = "推送 → 付款处理(支付结果) → 失败";
                 }
                 break;
+            case "https://biptestctny.invest.com.cn:8002/iuap-api-auth/yonbip/ctm/bank/tran/add":
+                saveResponseBody = pushBill(token, saveUrl, saveRequestBody);
+                jsonObject = JSON.parseObject(saveResponseBody);
+                code = jsonObject.getString("code");
+                if ("200".equals(code)) {
+                    dynamic.set("shkd_pushstatus", "已推送");
+                    dynamicObjects.add(dynamic);
+                    logger.info("电子回单查询 → BIP推送接口 → 成功\n成功单据编号：{}\n成功请求体：{}\n推送成功接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
+                    result = "推送 → 电子回单查询 → 成功";
+                } else {
+                    logger.info("电子回单查询 → BIP推送接口 → 失败\n失败单据编号：{}\n失败请求体：{}\n推送失败接口返回数据：{}", dynamic.getString("billno"), saveRequestBody, saveResponseBody);
+                    result = "推送 → 电子回单查询 → 失败";
+                }
+                break;
             default:
                 result = "暂不支持该业务推送";
         }

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/form/ApiMappingBillPlugin.java

@@ -97,7 +97,7 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin {
             // 银企交易明细查询
             case "bei_transdetail_cas":
                 DynamicObject[] objects3 = BusinessDataServiceHelper.load("bei_transdetail_cas",
-                        "id,bizdate,oppbank,oppunit,accountbank,description,company,oppbanknumber," +
+                        "id,billno,bizdate,oppbank,oppunit,accountbank,description,company,oppbanknumber," +
                                 "bankdetailno,transbalance,description,debitamount,creditamount,shkd_pushstatus," +
                                 "shkd_businessnumber,shkd_businessid,shkd_businessname"
                         , new QFilter("billno", QCP.equals, billNumber).toArray());
@@ -107,7 +107,7 @@ public class ApiMappingBillPlugin extends AbstractFormPlugin implements Plugin {
             // 电子回单查询
             case "bei_elecreceipt":
                 DynamicObject[] objects4 = BusinessDataServiceHelper.load("bei_elecreceipt",
-                        "id"
+                        "id,billno,shkd_pushstatus"
                         , new QFilter("billno", QCP.equals, billNumber).toArray());
                 billObject = objects4[0];
                 logger.info("获取银企交易明细查询推送对象 → billObject：{}", billObject);