gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
tanfengling@x-ri.com 2025-11-03 14:24:51 +08:00
parent 24dbc46364 75527a93cb
commit d624616a26
4 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lc123/cloud/app/plugin/form/pm/PurApplyBillPlugin.java
View File

@ -461,6 +461,7 @@ public class PurApplyBillPlugin extends AbstractBillPlugIn implements Plugin {
if (i == 0) { if (i == 0) {
model.setValue("org", LCJT);//申请组织 model.setValue("org", LCJT);//申请组织
model.setValue("dept", dept);//申请部门 model.setValue("dept", dept);//申请部门
model.setValue("tqq9_dept", dept);//创建部门
model.setValue("bizuser", user);//申请人 model.setValue("bizuser", user);//申请人
model.setValue("currency", currency);//币别 model.setValue("currency", currency);//币别
model.setValue("creator", user);//创建人 model.setValue("creator", user);//创建人

1
lc123/cloud/app/plugin/form/pm/PurorderEntryIntroPaybillPlugin.java
View File

@ -246,6 +246,7 @@ public class PurorderEntryIntroPaybillPlugin extends AbstractBillPlugIn imple
org = BusinessDataServiceHelper.loadSingle(tqq9_org.getLong("id"), "bos_org");//组织 org = BusinessDataServiceHelper.loadSingle(tqq9_org.getLong("id"), "bos_org");//组织
model.setValue("org", org);//申请组织 model.setValue("org", org);//申请组织
model.setValue("dept", dept);//申请部门 model.setValue("dept", dept);//申请部门
model.setValue("tqq9_dept", dept);//创建部门
model.setValue("creator", user);//创建人 model.setValue("creator", user);//创建人
model.setValue("lastupdateuser", user);//修改人 model.setValue("lastupdateuser", user);//修改人
model.setValue("currency", currency);//币别 model.setValue("currency", currency);//币别

2
lc123/cloud/app/plugin/operate/conm/RebateRuleAuditToFlOp.java
View File

@ -7,7 +7,7 @@ import kd.bos.logging.LogFactory;
import kd.sdk.plugin.Plugin; import kd.sdk.plugin.Plugin;
/** /**
* 单据操作插件 * 单据操作插件(暂时不用)
*/ */
public class RebateRuleAuditToFlOp extends AbstractOperationServicePlugIn implements Plugin { public class RebateRuleAuditToFlOp extends AbstractOperationServicePlugIn implements Plugin {
private final static Log logger = LogFactory.getLog(RebateRuleAuditToFlOp.class); private final static Log logger = LogFactory.getLog(RebateRuleAuditToFlOp.class);

62
lc123/cloud/app/plugin/operate/sys/RebateRuleOpPlugin.java
View File

@ -22,6 +22,7 @@ import tqq9.lc123.cloud.app.plugin.utils.HttpRequestUtils;
import java.io.IOException; import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
@ -83,12 +84,17 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement
e.getFieldKeys().add("tqq9_exclupur"); e.getFieldKeys().add("tqq9_exclupur");
e.getFieldKeys().add("tqq9_purchaseorder"); e.getFieldKeys().add("tqq9_purchaseorder");
e.getFieldKeys().add("tqq9_rebateamount"); e.getFieldKeys().add("tqq9_rebateamount");
e.getFieldKeys().add("tqq9_rebate_entry.tqq9_excl_start_base");
e.getFieldKeys().add("tqq9_rebate_entry.tqq9_excl_end_base");
e.getFieldKeys().add("tqq9_rebate_entry.tqq9_proportion");
} }
@Override @Override
public void afterExecuteOperationTransaction(AfterOperationArgs e) { public void afterExecuteOperationTransaction(AfterOperationArgs e) {
super.afterExecuteOperationTransaction(e); super.afterExecuteOperationTransaction(e);
for (DynamicObject dataEntity : e.getDataEntities()) { for (DynamicObject dataEntity : e.getDataEntities()) {
Gson gson = new Gson();
// HashMap<String, Object> bodyMap = new HashMap<>(); // HashMap<String, Object> bodyMap = new HashMap<>();
HashMap<String, String> tokenMap = new HashMap<String, String>(); HashMap<String, String> tokenMap = new HashMap<String, String>();
tokenMap.put("Authorization", FLXT_TOKEN); tokenMap.put("Authorization", FLXT_TOKEN);
@ -105,14 +111,14 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement
DynamicObjectCollection tqq9_supplier = dataEntity.getDynamicObjectCollection("tqq9_supplier");//返利供应商 DynamicObjectCollection tqq9_supplier = dataEntity.getDynamicObjectCollection("tqq9_supplier");//返利供应商
StringBuilder supplierIds = new StringBuilder(); StringBuilder supplierIds = new StringBuilder();
for (DynamicObject dynamicObject : tqq9_supplier) { for (DynamicObject dynamicObject : tqq9_supplier) {
supplierIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("id")); supplierIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztsupplierid"));
} }
BigDecimal tqq9_estimatepro = dataEntity.getBigDecimal("tqq9_estimatepro");//预测比例 BigDecimal tqq9_estimatepro = dataEntity.getBigDecimal("tqq9_estimatepro").setScale(2, RoundingMode.HALF_UP);//预测比例
BigDecimal tqq9_targetamount = dataEntity.getBigDecimal("tqq9_targetamount");//预测总金额 BigDecimal tqq9_targetamount = dataEntity.getBigDecimal("tqq9_targetamount").setScale(2, RoundingMode.HALF_UP);//预测总金额
DynamicObjectCollection tqq9_rebatebrand = dataEntity.getDynamicObjectCollection("tqq9_rebatebrand");//返利品牌 DynamicObjectCollection tqq9_rebatebrand = dataEntity.getDynamicObjectCollection("tqq9_rebatebrand");//返利品牌
StringBuilder rebatebrandIds = new StringBuilder(); StringBuilder rebatebrandIds = new StringBuilder();
for (DynamicObject dynamicObject : tqq9_rebatebrand) { for (DynamicObject dynamicObject : tqq9_rebatebrand) {
rebatebrandIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("id")); rebatebrandIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("tqq9_ztbrandid"));
} }
DynamicObjectCollection tqq9_rebategoods = dataEntity.getDynamicObjectCollection("tqq9_rebategoods");//返利商品 DynamicObjectCollection tqq9_rebategoods = dataEntity.getDynamicObjectCollection("tqq9_rebategoods");//返利商品
StringBuilder rebategoodsIds = new StringBuilder(); StringBuilder rebategoodsIds = new StringBuilder();
@ -142,9 +148,9 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement
List.add(bjList); List.add(bjList);
} }
} else { } else {
BigDecimal tqq9_gzlcbl = dataEntity.getBigDecimal("tqq9_gzlcbl"); BigDecimal tqq9_gzlcbl = dataEntity.getBigDecimal("tqq9_gzlcbl").setScale(2, RoundingMode.HALF_UP);
BigDecimal tqq9_shlcbl = dataEntity.getBigDecimal("tqq9_shlcbl"); BigDecimal tqq9_shlcbl = dataEntity.getBigDecimal("tqq9_shlcbl").setScale(2, RoundingMode.HALF_UP);
BigDecimal tqq9_bjlcbl = dataEntity.getBigDecimal("tqq9_bjlcbl"); BigDecimal tqq9_bjlcbl = dataEntity.getBigDecimal("tqq9_bjlcbl").setScale(2, RoundingMode.HALF_UP);
if (tqq9_gzlcbl.compareTo(BigDecimal.ZERO) > 0) { if (tqq9_gzlcbl.compareTo(BigDecimal.ZERO) > 0) {
List<String> gzList = new ArrayList<>(); List<String> gzList = new ArrayList<>();
gzList.add("GZ_LC"); gzList.add("GZ_LC");
@ -164,27 +170,27 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement
List.add(bjList); List.add(bjList);
} }
} }
String distributeCity = List.toString(); String distributeCity = gson.toJson(List);
List<List<String>> calculationProportionList = new ArrayList<>(); List<List<String>> calculationProportionList = new ArrayList<>();
BigDecimal tqq9_excl_start_base = dataEntity.getBigDecimal("tqq9_excl_start_base"); DynamicObjectCollection tqq9_rebate_entry = dataEntity.getDynamicObjectCollection("tqq9_rebate_entry");
BigDecimal tqq9_excl_end_base = dataEntity.getBigDecimal("tqq9_excl_end_base"); for (DynamicObject dynamicObject : tqq9_rebate_entry) {
BigDecimal tqq9_proportion = dataEntity.getBigDecimal("tqq9_proportion"); List<String> flList = new ArrayList<>();
if (tqq9_excl_start_base.compareTo(BigDecimal.ZERO) > 0) {
List<String> startList = new ArrayList<>(); BigDecimal tqq9_excl_start_base = dynamicObject.getBigDecimal("tqq9_excl_start_base").setScale(2, RoundingMode.HALF_UP);
startList.add(tqq9_excl_start_base.toString()); BigDecimal tqq9_excl_end_base = dynamicObject.getBigDecimal("tqq9_excl_end_base").setScale(2, RoundingMode.HALF_UP);
calculationProportionList.add(startList); BigDecimal tqq9_proportion = dynamicObject.getBigDecimal("tqq9_proportion").setScale(2, RoundingMode.HALF_UP);
if (tqq9_excl_start_base.compareTo(BigDecimal.ZERO) > 0&&tqq9_proportion.compareTo(BigDecimal.ZERO) > 0&&tqq9_excl_end_base.compareTo(BigDecimal.ZERO) > 0) {
flList.add(tqq9_excl_start_base.toString());
flList.add(tqq9_proportion.toString());
flList.add(tqq9_excl_end_base.toString());
}
calculationProportionList.add(flList);
} }
if (tqq9_proportion.compareTo(BigDecimal.ZERO) > 0) {
List<String> proportionList = new ArrayList<>();
proportionList.add(tqq9_proportion.toString()); //String calculationProportion = calculationProportionList.toString();
calculationProportionList.add(proportionList); String calculationProportion = gson.toJson(calculationProportionList);
}
if (tqq9_excl_end_base.compareTo(BigDecimal.ZERO) > 0) {
List<String> endList = new ArrayList<>();
endList.add(tqq9_excl_end_base.toString());
calculationProportionList.add(endList);
}
String calculationProportion = calculationProportionList.toString();
Integer isTax = 1; Integer isTax = 1;
Boolean tqq9_istax = dataEntity.getBoolean("tqq9_istax");//是否含税 Boolean tqq9_istax = dataEntity.getBoolean("tqq9_istax");//是否含税
if (tqq9_istax) { if (tqq9_istax) {
@ -263,13 +269,13 @@ public class RebateRuleOpPlugin extends AbstractOperationServicePlugIn implement
purchaseorderIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("billno")); purchaseorderIds.append(",").append(dynamicObject.getDynamicObject("fbasedataid").getString("billno"));
} }
} }
BigDecimal tqq9_rebateamount = dataEntity.getBigDecimal("tqq9_rebateamount");//返利金额 BigDecimal tqq9_rebateamount = dataEntity.getBigDecimal("tqq9_rebateamount").setScale(2, RoundingMode.HALF_UP);//返利金额
bodyMap.put("orderIds", (purchaseorderIds.length() == 0) ? null : purchaseorderIds.substring(1)); bodyMap.put("orderIds", (purchaseorderIds.length() == 0) ? null : purchaseorderIds.substring(1));
bodyMap.put("returnMoney", tqq9_rebateamount); bodyMap.put("returnMoney", tqq9_rebateamount);
} }
Gson gson = new Gson();
LCLogService lcLogService = new LCLogServiceImpl(); LCLogService lcLogService = new LCLogServiceImpl();
try { try {
String bodyString = HttpRequestUtils.postJson(Push_URL, bodyMap.toString(), tokenMap); String bodyString = HttpRequestUtils.postJson(Push_URL, bodyMap.toString(), tokenMap);