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

丽知：tob、toc仅退款修改过滤条件。

This commit is contained in:
zhengyf 2025-02-25 10:31:59 +08:00
parent d36c444c74
commit 22129dc5af
2 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,10 +637,23 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
} }
} }
if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx4.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx5.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx6.compareTo(BigDecimal.ZERO) == 0) {
continue; continue;
} }
if (sum_jfbbje.compareTo(BigDecimal.ZERO) != 0) {
childrenn.setJfbbje("-" + sum_jfbbje);
childrenn.setJfybje("-" + sum_jfbbje);
childrenn.setJfbbsj("-" + sum_jfbbsj);
childrenn.setJfybsj("-" + sum_jfbbsj);
childrenn.setWbfbbje("-" + sum_wbfbbje);
childrenn.setJfybwsje("-" + sum_wbfbbje);
children.add(childrenn);
}
childrenn.setJfbbje("-" + sum_jfbbje); childrenn.setJfbbje("-" + sum_jfbbje);
childrenn.setJfybje("-" + sum_jfbbje); childrenn.setJfybje("-" + sum_jfbbje);
childrenn.setJfbbsj("-" + sum_jfbbsj); childrenn.setJfbbsj("-" + sum_jfbbsj);

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

@ -615,19 +615,6 @@ public class RefundOnlyPluginInitializerToC 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) {
// 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) { if (detail.getPlatformDiscounts() != null) {
sum_zyx4 = sum_zyx4.add(new BigDecimal(detail.getPlatformDiscounts())); sum_zyx4 = sum_zyx4.add(new BigDecimal(detail.getPlatformDiscounts()));
} }
@ -640,20 +627,23 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
} }
} }
if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx4.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx5.compareTo(BigDecimal.ZERO) == 0
&& sum_zyx6.compareTo(BigDecimal.ZERO) == 0) {
continue; continue;
} }
childrenn.setJfbbje("-" + sum_jfbbje); if(sum_jfbbje.compareTo(BigDecimal.ZERO) != 0){
childrenn.setJfybje("-" + sum_jfbbje); childrenn.setJfbbje("-" + sum_jfbbje);
childrenn.setJfbbsj("-" + sum_jfbbsj); childrenn.setJfybje("-" + sum_jfbbje);
childrenn.setJfybsj("-" + sum_jfbbsj); childrenn.setJfbbsj("-" + sum_jfbbsj);
childrenn.setWbfbbje("-" + sum_wbfbbje); childrenn.setJfybsj("-" + sum_jfbbsj);
childrenn.setJfybwsje("-" + sum_wbfbbje); childrenn.setWbfbbje("-" + sum_wbfbbje);
// childrenn.setZyx4(String.valueOf(sum_zyx4)); childrenn.setJfybwsje("-" + sum_wbfbbje);
// childrenn.setZyx5(String.valueOf(sum_zyx5)); children.add(childrenn);
// childrenn.setZyx6(String.valueOf(sum_zyx6)); }
children.add(childrenn);
//新增三个优惠为存货 //新增三个优惠为存货
if (sum_zyx4.compareTo(BigDecimal.ZERO) > 0) {//平台优惠 if (sum_zyx4.compareTo(BigDecimal.ZERO) > 0) {//平台优惠