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

丽知：优化仅退款店铺取数逻辑

This commit is contained in:
zhengyf 2025-01-22 11:23:41 +08:00
parent 695c799eb6
commit a9a35f4aaf
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java
View File

@ -477,7 +477,8 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>(); List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>();
for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) { for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) {
allDetail.stream().forEach(index -> { allDetail.stream().forEach(index -> {
if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) { // if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null) {
ofsDetails.add(index); ofsDetails.add(index);
} }
}); });
@ -548,7 +549,7 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
// BigDecimal sum_zyx7 = new BigDecimal(0); // BigDecimal sum_zyx7 = new BigDecimal(0);
//查询是否需要参考售价 //查询是否需要参考售价
if (isReferenceShop) { if (isReferenceShop) {//五个店铺
//查询存货基本档案，管理档案，取参考售价 //查询存货基本档案，管理档案，取参考售价
BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk); BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk);
if (bdInvbasdocEntity == null) { if (bdInvbasdocEntity == null) {
@ -595,9 +596,14 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
} }
} }
} else { } else {//非五个店铺
//金额计算 //金额计算
for (RerturnGoodsOrderSearchDetails detail : vv) { for (RerturnGoodsOrderSearchDetails detail : vv) {
if("0".equals(detail.getTotalAmount())){
continue;
}
sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount())); sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount()));
BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR); BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR);

11
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java
View File

@ -479,7 +479,8 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>(); List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>();
for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) { for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) {
allDetail.stream().forEach(index -> { allDetail.stream().forEach(index -> {
if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) { // if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null) {
ofsDetails.add(index); ofsDetails.add(index);
} }
}); });
@ -550,7 +551,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
//查询是否需要参考售价 //查询是否需要参考售价
if (isReferenceShop) { if (isReferenceShop) {//五个店铺
//查询存货基本档案，管理档案，取参考售价 //查询存货基本档案，管理档案，取参考售价
BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk); BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk);
if (bdInvbasdocEntity == null) { if (bdInvbasdocEntity == null) {
@ -597,11 +598,15 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
} }
} }
} else { } else {//非五个店铺
//金额计算 //金额计算
for (RerturnGoodsOrderSearchDetails detail : vv) { for (RerturnGoodsOrderSearchDetails detail : vv) {
if("0".equals(detail.getTotalAmount())){
continue;
}
sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount())); sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount()));
BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR); BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR);