From d79a171b47c8af14ab77d00c11fa0fa8f5795e73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=9A=E8=B1=86=E8=B1=86?= <13356128+sunandmoon60@user.noreply.gitee.com> Date: Fri, 21 Nov 2025 14:58:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BF=94=E5=88=A9=E7=B3=BB=E7=BB=9F=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=8F=98=E6=9B=B4=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/ap/PayBillOperationPlugin.java | 23 ++++++++++--------- .../operate/sys/ValiddaysSavePlugin.java | 4 ++-- .../app/plugin/task/DaysRemainingTask.java | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/lc123/cloud/app/plugin/operate/ap/PayBillOperationPlugin.java b/lc123/cloud/app/plugin/operate/ap/PayBillOperationPlugin.java index 7632fd2..99e9086 100644 --- a/lc123/cloud/app/plugin/operate/ap/PayBillOperationPlugin.java +++ b/lc123/cloud/app/plugin/operate/ap/PayBillOperationPlugin.java @@ -51,7 +51,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple new QFilter[]{new QFilter("number", QCP.equals, "EqmDatabase_password")}); PASSWORD = passWord != null ? passWord.getString("name") : null; url = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name", - new QFilter[]{new QFilter("number", QCP.equals, "FLXT_BillCreate_Url")}); + new QFilter[]{new QFilter("number", QCP.equals, "FLXT_Deduct_Url")}); Use_URL = url != null ? url.getString("name") : null; DynamicObject token = BusinessDataServiceHelper.loadSingle("tqq9_thirdconfig", "name", new QFilter[]{new QFilter("number", QCP.equals, "FLXT_TOKEN")}); @@ -101,7 +101,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利 BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额 BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额 - if (pm_purorderbill != null && !tqq9_isrebatecalculate&&(tqq9_hshfsyje.compareTo(BigDecimal.ZERO)>0||tqq9_hsxfsyje.compareTo(BigDecimal.ZERO)>0)) { + if (pm_purorderbill != null && !tqq9_isrebatecalculate && (tqq9_hshfsyje.compareTo(BigDecimal.ZERO) > 0 || tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0)) { if (actpayamt.compareTo(tqq9_hshfsyje.add(tqq9_hsxfsyje)) < 0) { this.addErrorMessage(dataEntity, "单据号:" + billno + ",付款金额小于采购订单返利金额，不允许付款"); } @@ -171,7 +171,7 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple DynamicObject pm_purorderbill = BusinessDataServiceHelper.loadSingle("pm_purorderbill", new QFilter[]{new QFilter("billno", QCP.equals, corebillno)}); Boolean tqq9_isrebatecalculate = pm_purorderbill.getBoolean("tqq9_isrebatecalculate");//是否已计算返利 String operationKey = e.getOperationKey(); - if (pm_purorderbill != null &&tqq9_isrebatecalculate&&StringUtils.equals("pay",operationKey)) { + if (pm_purorderbill != null && !tqq9_isrebatecalculate && StringUtils.equals("pay", operationKey)) { BigDecimal tqq9_hshfsyje = pm_purorderbill.getBigDecimal("tqq9_hshfsyje");//含税货返使用金额 BigDecimal tqq9_hsxfsyje = pm_purorderbill.getBigDecimal("tqq9_hsxfsyje");//含税现返使用金额 String tqq9_hfid = pm_purorderbill.getString("tqq9_hfid");//货返id @@ -190,19 +190,20 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple HashMap map = gson.fromJson(bodyString, HashMap.class); Boolean data = (Boolean) map.get("data"); if (data == null || !data) { - lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), bodyString); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString); this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败"); } else { pm_purorderbill.set("tqq9_isrebatecalculate", true); - lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), bodyString); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString); SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill}); } } catch (IOException ex) { - lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage()); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); throw new RuntimeException(ex); } - //现返审核 - } else if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0 && actpayamt.compareTo(BigDecimal.ZERO) > 0) { + } + //现返审核 + if (tqq9_hsxfsyje.compareTo(BigDecimal.ZERO) > 0 && actpayamt.compareTo(BigDecimal.ZERO) > 0) { BigDecimal notaxamount = tqq9_hsxfsyje.multiply(oneHundred.divide(oneHundred.add(new BigDecimal(13)), 10, RoundingMode.HALF_UP)).setScale(2, RoundingMode.HALF_UP); BigDecimal taxamount = tqq9_hsxfsyje.subtract(notaxamount);//税额 HashMap bodyMap = new HashMap<>(); @@ -215,15 +216,15 @@ public class PayBillOperationPlugin extends AbstractOperationServicePlugIn imple HashMap map = gson.fromJson(bodyString, HashMap.class); Boolean data = (Boolean) map.get("data"); if (data == null || !data) { - lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), bodyString); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, false, bodyMap.toString(), bodyString); this.getOperationResult().setMessage("付款单:" + billno + ",审核时扣除订单金额失败"); } else { pm_purorderbill.set("tqq9_isrebatecalculate", true); - lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), bodyString); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), bodyString); SaveServiceHelper.save(new DynamicObject[]{pm_purorderbill}); } } catch (IOException ex) { - lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage()); + lcLogService.savelog("FL-使用返利金额", Use_URL, false, true, bodyMap.toString(), "接口调用报错，errormessage:" + ex.getMessage()); throw new RuntimeException(ex); } } diff --git a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java index 283e040..e865be3 100644 --- a/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/ValiddaysSavePlugin.java @@ -31,7 +31,7 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen e.getFieldKeys().add("tqq9_datefield22"); e.getFieldKeys().add("tqq9_validdays_yljg"); e.getFieldKeys().add("tqq9_licenseenddate"); - e.getFieldKeys().add("tqq9_validdays_hzp"); + e.getFieldKeys().add("tqq9_integerfield");// e.getFieldKeys().add("tqq9_zlbzxyyxqz"); e.getFieldKeys().add("tqq9_validdays_zlbz"); e.getFieldKeys().add("tqq9_datefield2"); @@ -101,7 +101,7 @@ public class ValiddaysSavePlugin extends AbstractOperationServicePlugIn implemen Date tqq9_licenseenddate = dataEntity.getDate("tqq9_licenseenddate");//失效日期 if (tqq9_licenseenddate != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate); - dataEntity.set("tqq9_validdays_hzp", remainingDays); + dataEntity.set("tqq9_integerfield", remainingDays); Long tqq9_minvaliddays = dataEntity.getLong("tqq9_minvaliddays"); if (Long.compare(remainingDays, tqq9_minvaliddays) < 0) { dataEntity.set("tqq9_minvaliddays", remainingDays); diff --git a/lc123/cloud/app/plugin/task/DaysRemainingTask.java b/lc123/cloud/app/plugin/task/DaysRemainingTask.java index 8b140c6..244ba37 100644 --- a/lc123/cloud/app/plugin/task/DaysRemainingTask.java +++ b/lc123/cloud/app/plugin/task/DaysRemainingTask.java @@ -37,7 +37,7 @@ public class DaysRemainingTask extends AbstractTask implements Plugin { QFilter f2 = new QFilter("status", QCP.equals, "C"); DynamicObject[] suppliers = BusinessDataServiceHelper.load("bd_supplier", "id,number,name,tqq9_datefield1,tqq9_validdays_ylqxsc,tqq9_datefield21,tqq9_validdays_ylqxjy,tqq9_datefield4,tqq9_validdays_ylqxjy2,tqq9_datefield22," + - "tqq9_validdays_yljg,tqq9_licenseenddate,tqq9_validdays_hzp,tqq9_zlbzxyyxqz,tqq9_validdays_zlbz,tqq9_datefield2,tqq9_validdays_gmp,tqq9_datefield7," + + "tqq9_validdays_yljg,tqq9_licenseenddate,tqq9_integerfield,tqq9_zlbzxyyxqz,tqq9_validdays_zlbz,tqq9_datefield2,tqq9_validdays_gmp,tqq9_datefield7," + "tqq9_validdays_frsq,tqq9_datefield9,tqq9_validdays_yyzz,tqq9_gspyxqz,tqq9_validdays_gsp,tqq9_minvaliddays,creator.email", new QFilter[]{f1, f2}); Date currentDate = new Date();//当前日期 @@ -107,7 +107,7 @@ public class DaysRemainingTask extends AbstractTask implements Plugin { Date tqq9_licenseenddate = supplier.getDate("tqq9_licenseenddate");//失效日期 if (tqq9_licenseenddate != null) { remainingDays = DateDifferenceCalculator.calculateRemainingDays(tqq9_licenseenddate, currentDate); - supplier.set("tqq9_validdays_hzp", remainingDays); + supplier.set("tqq9_integerfield", remainingDays); Long tqq9_minvaliddays = supplier.getLong("tqq9_minvaliddays"); if (remainingDays < tqq9_minvaliddays) { supplier.set("tqq9_minvaliddays", remainingDays);