diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java index 46ff1c0..93c8703 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/api/PayBillApiSavePlugin.java @@ -129,75 +129,6 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { if (objects.length > 0) { DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank"); logger.info("dynamicObjectCollection：{}", dynamicObjectCollection); - int result = 0; - for (DynamicObject dynamicObject : dynamicObjectCollection) { - if (dynamicObject.getString("bankaccount").equals(payeebanknum)) { - result = 1; - logger.info("存在银行账号"); - break; - } - } - - if (result == 0) { - /*JSONObject app_token_jsonBody = new JSONObject(); - app_token_jsonBody.put("appId", "BIP"); - app_token_jsonBody.put("appSecret", "1qaz2wsx#EDC$RFV"); - app_token_jsonBody.put("tenantid", "ctsk-test"); - app_token_jsonBody.put("accountId", "2063187796394248192"); - String app_token_body = app_token_jsonBody.toString(); - - String app_token = updateBankInformation("http://10.1.7.83:8022/ierp/api/getAppToken.do", app_token_body, null); - logger.info("app_token_body：{}\napp_token:{}", app_token_body, app_token); - - JSONObject jsonObject = JSON.parseObject(app_token); - String key = jsonObject.getJSONObject("data").getString("app_token"); - - JSONObject access_token_jsonBody = new JSONObject(); - access_token_jsonBody.put("user", "17779007624"); - access_token_jsonBody.put("usertype", "Mobile"); - access_token_jsonBody.put("apptoken", key); - access_token_jsonBody.put("tenantid", "ctsk-test"); - access_token_jsonBody.put("accountId", "2063187796394248192"); - access_token_jsonBody.put("language", "zh_CN"); - String access_token_body = access_token_jsonBody.toString(); - - String access_token = updateBankInformation("http://10.1.7.83:8022/ierp/api/login.do", access_token_body, null); - logger.info("access_token_body：{}\naccess_token:{}", access_token_body, access_token); - String token = JSON.parseObject(access_token).getJSONObject("data").getString("access_token"); - - // 创建内部 JSON 对象 - JSONObject entryBank = new JSONObject(); - entryBank.put("bankaccount", payeebanknum);// 银行账号 - entryBank.put("accountname", payeebanknum);// 账户名称 - Map payeebank = (Map) map.get("payeebank"); - entryBank.put("bank_union_number", payeebank.get("number").toString());// 联行号 - entryBank.put("currency_number", "CNY"); - entryBank.put("isdefault_bank", "false"); - - // 创建 entry_bank 数组 - JSONArray entryBankArray = new JSONArray(); - entryBankArray.add(entryBank); - - // 创建 data 内部对象 - JSONObject dataObject = new JSONObject(); - dataObject.put("societycreditcode", map.get("payeenumber").toString());// 统一社会信用代码 - dataObject.put("entry_bank", entryBankArray); - - // 创建 data 数组 - JSONArray dataArray = new JSONArray(); - dataArray.add(dataObject); - - // 创建最外层 JSON 对象 - JSONObject body = new JSONObject(); - body.put("data", dataArray); - - // 将 JSONObject 转换为字符串 - String bodyString = body.toString(); - String resultBody = updateBankInformation("http://10.1.7.83:8022/ierp/kapi/v2/shkd/basedata/bd_supplier/supplier_save", bodyString, token); - logger.info("resultBody:{}", resultBody);*/ - - logger.info("不存在银行账号"); - } // 收款人编码 map.put("payeenumber", objects[0].getString("number")); @@ -217,77 +148,6 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { if (objects.length > 0) { DynamicObjectCollection dynamicObjectCollection = objects[0].getDynamicObjectCollection("entry_bank"); logger.info("dynamicObjectCollection：{}", dynamicObjectCollection); - int result = 0; - for (DynamicObject dynamicObject : dynamicObjectCollection) { - if (dynamicObject.getString("bankaccount").equals(payeebanknum)) { - result = 1; - logger.info("存在银行账号"); - break; - } - } - - if (result == 0) { - /*JSONObject app_token_jsonBody = new JSONObject(); - app_token_jsonBody.put("appId", "BIP"); - app_token_jsonBody.put("appSecret", "1qaz2wsx#EDC$RFV"); - app_token_jsonBody.put("tenantid", "ctsk-test"); - app_token_jsonBody.put("accountId", "2063187796394248192"); - String app_token_body = app_token_jsonBody.toString(); - - String app_token = updateBankInformation("http://10.1.7.83:8022/ierp/api/getAppToken.do", app_token_body, null); - logger.info("app_token_body：{}\napp_token:{}", app_token_body, app_token); - - JSONObject jsonObject = JSON.parseObject(app_token); - String key = jsonObject.getJSONObject("data").getString("app_token"); - - JSONObject access_token_jsonBody = new JSONObject(); - access_token_jsonBody.put("user", "17779007624"); - access_token_jsonBody.put("usertype", "Mobile"); - access_token_jsonBody.put("apptoken", key); - access_token_jsonBody.put("tenantid", "ctsk-test"); - access_token_jsonBody.put("accountId", "2063187796394248192"); - access_token_jsonBody.put("language", "zh_CN"); - String access_token_body = access_token_jsonBody.toString(); - - String access_token = updateBankInformation("http://10.1.7.83:8022/ierp/api/login.do", access_token_body, null); - logger.info("access_token_body：{}\naccess_token:{}", access_token_body, access_token); - - String token = JSON.parseObject(access_token).getJSONObject("data").getString("access_token"); - - // 创建内部 JSON 对象 - JSONObject entryBank = new JSONObject(); - entryBank.put("bankaccount", payeebanknum);// 银行账号 - entryBank.put("accountname", payeebanknum);// 账户名称 - Map payeebank = (Map) map.get("payeebank"); - entryBank.put("bank_union_number", payeebank.get("number").toString());// 联行号 - entryBank.put("currency_number", "CNY"); - entryBank.put("isdefault_bank", "false"); - - // 创建 entry_bank 数组 - JSONArray entryBankArray = new JSONArray(); - entryBankArray.add(entryBank); - - // 创建 data 内部对象 - JSONObject dataObject = new JSONObject(); - dataObject.put("societycreditcode", map.get("payeenumber").toString());// 统一社会信用代码 - dataObject.put("entry_bank", entryBankArray); - - // 创建 data 数组 - JSONArray dataArray = new JSONArray(); - dataArray.add(dataObject); - - // 创建最外层 JSON 对象 - JSONObject body = new JSONObject(); - body.put("data", dataArray); - - // 将 JSONObject 转换为字符串 - String bodyString = body.toString(); - String resultBody = updateBankInformation("http://10.1.7.83:8022/ierp/kapi/v2/shkd/basedata/bd_customer/customer_save", bodyString, token); - logger.info("resultBody:{}", resultBody);*/ - - logger.info("不存在银行账号"); - } - // 收款人编码 map.put("payeenumber", objects[0].getString("number")); // 收款人ID @@ -302,18 +162,6 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,name,number,username", new QFilter("username", QCP.equals, map.get("payeenumber").toString()).toArray()); if (objects.length > 0) { - // 收款银行（收款信息） 添加，如果没有收款信息则会报错 - DynamicObject[] er_payeers = BusinessDataServiceHelper.load("er_payeer", "id,outpayer,payeraccount", new QFilter("outpayer", QCP.equals, objects[0].getString("name")).and(new QFilter("payeraccount", QCP.equals, payeebanknum)).toArray()); - if (er_payeers.length > 0) { - Map payeraccount = new HashMap<>(); - payeraccount.put("payeraccount", payeebanknum); - map.put("shkd_reebankuser", payeraccount); - } else { - Map payeraccount = new HashMap<>(); - payeraccount.put("payeraccount", "1111111111"); - map.put("shkd_reebankuser", payeraccount); - } - // 收款人编码 map.put("payeenumber", objects[0].getString("number")); // 收款人ID @@ -328,20 +176,12 @@ public class PayBillApiSavePlugin implements ApiSavePlugin { DynamicObject[] objects = BusinessDataServiceHelper.load(payeetype.toString(), "id,number,name,", new QFilter("number", QCP.equals, map.get("payeenumber").toString()).toArray()); if (objects.length > 0) { - // 收款银行（账户查询） 添加，如果没有账户查询则会报错 - DynamicObject[] amAccountbanks1 = BusinessDataServiceHelper.load("am_accountbank", "id,bank,bank.number,company,company.name", - new QFilter("number", QCP.equals, payeebanknum).and( - new QFilter("bank.number", QCP.equals, objects[0].getString("name"))).toArray()); - logger.info("账户查询，通过银行账号查对应的收款账户长度:{}", amAccountbanks1.length); - if (amAccountbanks1.length > 0) { - Map payeraccount = new HashMap<>(); - payeraccount.put("bankaccountnumber", payeebanknum); - map.put("shkd_reebankorg", payeraccount); - } else { - Map payeraccount = new HashMap<>(); - payeraccount.put("bankaccountnumber", "1111111111"); - map.put("shkd_reebankorg", payeraccount); - } + // 收款人编码 + map.put("payeenumber", objects[0].getString("number")); + // 收款人ID + map.put(fieldName1, objects[0].getPkValue()); + //收款人编码 + objectNumber = objects[0].getString("number"); } } } diff --git a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java index a535af0..713f499 100644 --- a/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java +++ b/sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/PushTaskPlugin.java @@ -40,27 +40,22 @@ public class PushTaskPlugin extends AbstractTask implements Plugin { case "cas_paybill": DynamicObject[] objects1 = BusinessDataServiceHelper.load("cas_paybill", "id,billno,actpayamt,entry,entry.e_expenseitem,entry.e_remark,settletype,payeebanknum," + - "payeetype,payeenumber,payeracctbank,payeebank,payeebankname,paymenttype,org,org.number,bizdate,description," + + "payeetype,payeenumber,payeracctbank,payeebank,payeebankname,paymenttype,org,bizdate,description," + "shkd_pushstatus,shkd_businessnumber,shkd_businessid,shkd_businessname,billstatus,bankpaystatus" , new QFilter("bizdate", QCP.large_equals, calculateTheDate(2)) - .and("org.number", QCP.in, new String[]{ - "SIG1040100", - "SIG1090000", - "SIG000101135", - "SIG1041000", - "SIG1040802", - "SIG1040804", - "SIG1040803", - "SIG1040801", - "SIG1040400" - })//目前四家公司 .and("shkd_pushstatus", QCP.not_equals, "已结算") .and("shkd_pushstatus", QCP.not_equals, "结算失败") .and("billstatus", QCP.equals, "D").toArray()); - dynamicObjects = Arrays.asList(objects1); - dynamicObjects.forEach(dynamicObject -> ApiService.paymentSlipsJson(dynamicObject, "BIP", dynamicObjectList, null)); + + Arrays.stream(objects1).forEach(dynamicObject -> { + DynamicObject org = dynamicObject.getDynamicObject("org"); + if ("SIG1040100、SIG1090000、SIG000101135、SIG1041000、SIG1040802、SIG1040804、SIG1040803、SIG1040801、SIG1040400".contains(org.getString("number"))) { + ApiService.paymentSlipsJson(dynamicObject, "BIP", dynamicObjectList, null); + } + }); SaveServiceHelper.save(dynamicObjectList.toArray(new DynamicObject[0])); break; + /** * 支付结果推送（付款处理支付结果定时推送） * 我们的付款处理推送，推送结算结果直接默认为7