提交人：csx

提交时间：2025年01月04日
提交内容：交易明细推送共享定时任务

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

@@ -68,7 +68,7 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
             sourcebillnumber = shkd_sourcebill.getString("number");
             QFilter dzhdqFilter=null;
             //要推送单据的过滤（查询单子回单默认过滤条件）
-            if (sourcebillnumber.equals("bei_transdetail")){//交易明细
+            if (sourcebillnumber.equals("bei_transdetail_cas")){//交易明细
                 dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals,null);
             }else if (sourcebillnumber.equals("sourcebillnumber")){//电子回单
                 dzhdqFilter = new QFilter("ismatch", QCP.equals,true);
@@ -115,8 +115,9 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
                         res = doPost(shkd_url,headMap,saveRequestBody,null);
                         JSONObject otherIsJsonRS = JSONObject.parseObject(res);//获取返回结果
                         String flag = otherIsJsonRS.getString("flag");
-                        if ("0".equals(flag)){//失败
+                        if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败
                             resultMap.put("shkd_issuccess",false);//是否成功
+                            bei_elecreceipt.set("shkd_sfcgtsgx",false);
                         }else {
                             JSONArray datas = otherIsJsonRS.getJSONArray("data");
                             JSONObject data = datas.getJSONObject(0);
@@ -132,6 +133,8 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
                         break;
                     case "5":
                         res="";
+                        resultMap.put("shkd_issuccess",false);//是否成功
+                        bei_elecreceipt.set("shkd_sfcgtsgx",false);
                         break;
                     default:
                         System.out.println("无效的选项");
@@ -360,6 +363,10 @@ public class tsgxApiMappingBillPlugin extends AbstractBillPlugIn {
                     value="2";
                 }
                 break;
+            case "settlementAmount":
+                BigDecimal add = bei_elecreceipt.getBigDecimal("debitamount").add(bei_elecreceipt.getBigDecimal("creditamount"));//付款金额+收款金额
+                value=add.toPlainString();
+                break;
             default:
                 break;
         }

sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java

@@ -50,8 +50,9 @@ public class SharePushTaskPlugin extends AbstractTask {
     String sourcebillnumber = "";
     @Override
     public void execute(RequestContext requestContext, Map<String, Object> map) throws KDException {
+        Object type =  map.get("type");
         //获取司库电子回单推送共享系统的对应映射
-        QFilter qFilter = new QFilter("shkd_name", QCP.equals,"司库电子回单推送共享系统");
+        QFilter qFilter = new QFilter("shkd_name", QCP.equals,type);
         DynamicObject shkd_apimappingid = BusinessDataServiceHelper.loadSingle("shkd_apimapping", "id", qFilter.toArray());
         if (shkd_apimappingid==null){
             logger.info("未找到对应的推送接口映射");
@@ -63,7 +64,7 @@ public class SharePushTaskPlugin extends AbstractTask {
         sourcebillnumber = shkd_sourcebill.getString("number");
         QFilter dzhdqFilter=null;
         //要推送单据的过滤（查询单子回单默认过滤条件）
-        if (sourcebillnumber.equals("bei_transdetail")){//交易明细
+        if (sourcebillnumber.equals("bei_transdetail_cas")){//交易明细
             dzhdqFilter = new QFilter("bankdetailno", QCP.not_equals,null);
         }else if (sourcebillnumber.equals("sourcebillnumber")){//电子回单
             dzhdqFilter = new QFilter("ismatch", QCP.equals,true);
@@ -110,7 +111,7 @@ 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)){//失败
+                    if ("0".equals(flag)||"null".equals(flag)||flag==null){//失败
                         resultMap.put("shkd_issuccess",false);//是否成功
                     }else {
                         JSONArray datas = otherIsJsonRS.getJSONArray("data");
@@ -127,6 +128,8 @@ public class SharePushTaskPlugin extends AbstractTask {
                     break;
                 case "5":
                     res="";
+                    resultMap.put("shkd_issuccess",false);//是否成功
+                    bei_elecreceipt.set("shkd_sfcgtsgx",false);
                     break;
                 default:
                     System.out.println("无效的选项");
@@ -326,6 +329,7 @@ public class SharePushTaskPlugin extends AbstractTask {
                             "fileflag,filepath,biztype,bankcheckflag,fileserverurl,tcpurl,uploadfilename,username,password," +
                             "bank.bank_cate bankcate", new QFilter[]{new QFilter("id", QCP.equals, bei_elecreceipt.getPkValue())});
                     value = ApiService.getPdfUrl(viewByDynamicObj.getPageId(), receipts, errMsgList);
+                    value="https://www.baidu.com/";//测试链接
                     logger.info("单据编号："+bei_elecreceipt.getString("billno")+"对应url："+value);
                 }
                 break;