hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

丽知：仅退款价格取值修改

This commit is contained in:
zhengyf 2024-11-12 16:26:39 +08:00
parent 3e0abdab6e
commit b2a4188c1b
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializer.java
View File

@ -363,7 +363,7 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity {
List<RerturnGoodsOrderSearchHeader> allHeader = new ArrayList<>(); List<RerturnGoodsOrderSearchHeader> allHeader = new ArrayList<>();
//分摊 //分摊
for (RerturnGoodsOrderSearchData filterReturnGoodsOrder : filterReturnGoodsOrders) { for (RerturnGoodsOrderSearchData filterReturnGoodsOrder : filterReturnGoodsOrders) {
ofsOrderAfterSalesAmountAllocationUtil.tocSalesAmountAllocation(filterReturnGoodsOrder); // ofsOrderAfterSalesAmountAllocationUtil.tocSalesAmountAllocation(filterReturnGoodsOrder);
//查询部门 //查询部门
String refOrderCode = filterReturnGoodsOrder.getHeader().getRefOrderCode(); String refOrderCode = filterReturnGoodsOrder.getHeader().getRefOrderCode();
SaleOrderMessageDto ofsSaleOrder = getOfsOrder(refOrderCode); SaleOrderMessageDto ofsSaleOrder = getOfsOrder(refOrderCode);
@ -498,14 +498,14 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity {
BigDecimal sum_jfbbsj = new BigDecimal(0); BigDecimal sum_jfbbsj = new BigDecimal(0);
//sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额
BigDecimal sum_wbfbbje = new BigDecimal(0); BigDecimal sum_wbfbbje = new BigDecimal(0);
//sum:zyx4 平台优惠 //sum:zyx4 平台优惠 platformDiscounts
BigDecimal sum_zyx4 = new BigDecimal(0); BigDecimal sum_zyx4 = new BigDecimal(0);
//sum:zyx5 支付优惠 //sum:zyx5 支付优惠 payDiscounts
BigDecimal sum_zyx5 = new BigDecimal(0); BigDecimal sum_zyx5 = new BigDecimal(0);
//sum:zyx6 达人优惠 //sum:zyx6 达人优惠 expertDiscounts
BigDecimal sum_zyx6 = new BigDecimal(0); BigDecimal sum_zyx6 = new BigDecimal(0);
//sum:zyx7 商家优惠 //sum:zyx7 商家优惠
BigDecimal sum_zyx7 = new BigDecimal(0); // BigDecimal sum_zyx7 = new BigDecimal(0);
//金额计算 //金额计算
for (RerturnGoodsOrderSearchDetails detail : vv) { for (RerturnGoodsOrderSearchDetails detail : vv) {
@ -517,17 +517,27 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity {
BigDecimal ws = new BigDecimal(detail.getTotalAmount()).subtract(sj); BigDecimal ws = new BigDecimal(detail.getTotalAmount()).subtract(sj);
sum_wbfbbje = sum_wbfbbje.add(ws); sum_wbfbbje = sum_wbfbbje.add(ws);
if (detail.getShareTargetPlatformDiscounts() != null) { // if (detail.getShareTargetPlatformDiscounts() != null) {
sum_zyx4 = sum_zyx4.add(detail.getShareTargetPlatformDiscounts()); // sum_zyx4 = sum_zyx4.add(detail.getShareTargetPlatformDiscounts());
// }
// if (detail.getShareTargetMerchantDiscounts() != null) {
// sum_zyx5 = sum_zyx5.add(detail.getShareTargetMerchantDiscounts());
// }
// if (detail.getShareTargetExpertDiscounts() != null) {
// sum_zyx6 = sum_zyx6.add(detail.getShareTargetExpertDiscounts());
// }
// if (detail.getShareTargetPayDiscounts() != null) {
// sum_zyx7 = sum_zyx7.add(detail.getShareTargetPayDiscounts());
// }
if (detail.getPlatformDiscounts() != null) {
sum_zyx4 = sum_zyx4.add(new BigDecimal(detail.getPlatformDiscounts()));
} }
if (detail.getShareTargetMerchantDiscounts() != null) { if (detail.getPayDiscounts() != null) {
sum_zyx5 = sum_zyx5.add(detail.getShareTargetMerchantDiscounts()); sum_zyx5 = sum_zyx5.add(new BigDecimal(detail.getPayDiscounts()));
} }
if (detail.getShareTargetExpertDiscounts() != null) { if (detail.getExpertDiscounts() != null) {
sum_zyx6 = sum_zyx6.add(detail.getShareTargetExpertDiscounts()); sum_zyx6 = sum_zyx6.add(new BigDecimal(detail.getExpertDiscounts()));
}
if (detail.getShareTargetPayDiscounts() != null) {
sum_zyx7 = sum_zyx7.add(detail.getShareTargetPayDiscounts());
} }
} }
childrenn.setJfbbje("-" + sum_jfbbje); childrenn.setJfbbje("-" + sum_jfbbje);
@ -539,7 +549,6 @@ public class RefundOnlyPluginInitializer extends PluginBaseEntity {
childrenn.setZyx4(String.valueOf(sum_zyx4)); childrenn.setZyx4(String.valueOf(sum_zyx4));
childrenn.setZyx5(String.valueOf(sum_zyx5)); childrenn.setZyx5(String.valueOf(sum_zyx5));
childrenn.setZyx6(String.valueOf(sum_zyx6)); childrenn.setZyx6(String.valueOf(sum_zyx6));
childrenn.setZyx7(String.valueOf(sum_zyx7));
children.add(childrenn); children.add(childrenn);
//推送 //推送