From d1808fe7af0662a304a24f9c293fa2b2f8387bf3 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: Wed, 26 Nov 2025 18:15:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BF=94=E5=88=A9=E8=A7=84=E5=88=99=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E8=BF=94=E5=88=A9=E7=B3=BB=E7=BB=9F=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=202.=E5=88=9B=E5=BB=BA=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/operate/conm/PurconmAuditToFLOp.java | 4 +++- .../plugin/operate/sys/RebateRuleOpPlugin.java | 16 ++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lc123/cloud/app/plugin/operate/conm/PurconmAuditToFLOp.java b/lc123/cloud/app/plugin/operate/conm/PurconmAuditToFLOp.java index 83cfe74..05db346 100644 --- a/lc123/cloud/app/plugin/operate/conm/PurconmAuditToFLOp.java +++ b/lc123/cloud/app/plugin/operate/conm/PurconmAuditToFLOp.java @@ -11,6 +11,7 @@ import kd.bos.logging.Log; import kd.bos.logging.LogFactory; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.OperationServiceHelper; +import kd.bos.servicehelper.operation.SaveServiceHelper; import tqq9.lc123.cloud.app.api.utils.Constants; /** @@ -35,7 +36,6 @@ public class PurconmAuditToFLOp extends AbstractOperationServicePlugIn { DynamicObject tqq9_pur_rebate = object.getDynamicObject("tqq9_pur_rebate"); if (null != tqq9_pur_rebate) { tqq9_pur_rebate = BusinessDataServiceHelper.loadSingle(tqq9_pur_rebate.getLong("id"), "tqq9_pur_rebate"); - tqq9_pur_rebate.set("tqq9_isupdate",true); OperateOption operateOption = OperateOption.create(); OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, "tqq9_pur_rebate", new DynamicObject[]{tqq9_pur_rebate}, operateOption); if (!auditResult.isSuccess()) { @@ -45,6 +45,8 @@ public class PurconmAuditToFLOp extends AbstractOperationServicePlugIn { }); logger.info("返利规则：" + tqq9_pur_rebate.getString("number") + "审批失败:" + message); } + tqq9_pur_rebate.set("tqq9_isupdate",true); + SaveServiceHelper.save(new DynamicObject[]{tqq9_pur_rebate} ); } } diff --git a/lc123/cloud/app/plugin/operate/sys/RebateRuleOpPlugin.java b/lc123/cloud/app/plugin/operate/sys/RebateRuleOpPlugin.java index 623f211..22a3ca9 100644 --- a/lc123/cloud/app/plugin/operate/sys/RebateRuleOpPlugin.java +++ b/lc123/cloud/app/plugin/operate/sys/RebateRuleOpPlugin.java @@ -124,7 +124,13 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement DynamicObjectCollection tqq9_rebatebrand = dataEntity.getDynamicObjectCollection("tqq9_rebatebrand");//返利品牌 StringBuilder rebatebrandIds = new StringBuilder(); for (DynamicObject dynamicObject : tqq9_rebatebrand) { - rebatebrandIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztbrandid")); + String tqq9_ztbrandid = dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztbrandid"); + String id1 = dynamicObject.getDynamicObject("fbasedataid").getString("id"); + if(StringUtils.isNotBlank(tqq9_ztbrandid)){ + rebatebrandIds.append(",").append(tqq9_ztbrandid); + }else{ + rebatebrandIds.append(",").append(id1); + } } DynamicObjectCollection tqq9_rebategoods = dataEntity.getDynamicObjectCollection("tqq9_rebategoods");//返利商品 StringBuilder rebategoodsIds = new StringBuilder(); @@ -347,7 +353,13 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement DynamicObjectCollection tqq9_supplier = dataEntity.getDynamicObjectCollection("tqq9_supplier");//返利供应商 StringBuilder supplierIds = new StringBuilder(); for (DynamicObject dynamicObject : tqq9_supplier) { - supplierIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztsupplierid")); + String tqq9_ztsupplierid = dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztsupplierid"); + String id1 = dynamicObject.getDynamicObject("fbasedataid").getString("id"); + if (StringUtils.isNotBlank(tqq9_ztsupplierid)) { + supplierIds.append(",").append(tqq9_ztsupplierid); + }else{ + supplierIds.append(",").append(id1); + } } BigDecimal tqq9_estimatepro = dataEntity.getBigDecimal("tqq9_estimatepro").setScale(2, RoundingMode.HALF_UP);//预测比例 BigDecimal tqq9_targetamount = dataEntity.getBigDecimal("tqq9_targetamount").setScale(2, RoundingMode.HALF_UP);//预测总金额