diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java index fac9182c..88b9af80 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java @@ -563,11 +563,92 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { childrenn.setJfybsj("-" + sum_jfbbsj); childrenn.setWbfbbje("-" + sum_wbfbbje); childrenn.setJfybwsje("-" + sum_wbfbbje); - childrenn.setZyx4(String.valueOf(sum_zyx4)); - childrenn.setZyx5(String.valueOf(sum_zyx5)); - childrenn.setZyx6(String.valueOf(sum_zyx6)); +// childrenn.setZyx4(String.valueOf(sum_zyx4)); +// childrenn.setZyx5(String.valueOf(sum_zyx5)); +// childrenn.setZyx6(String.valueOf(sum_zyx6)); children.add(childrenn); + //新增三个优惠为存货 + if(sum_zyx4.compareTo(BigDecimal.ZERO)>0){//平台优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY01"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx4); + BigDecimal sj_FY = sum_zyx4.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx4.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + if(sum_zyx5.compareTo(BigDecimal.ZERO)>0){//支付优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY04"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx5); + BigDecimal sj_FY = sum_zyx5.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx5.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + if(sum_zyx6.compareTo(BigDecimal.ZERO)>0){//达人优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY02"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx6); + BigDecimal sj_FY = sum_zyx6.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx6.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + + //zyx19 ofs单号 String ofsOrdersCode = vv.stream().map(RerturnGoodsOrderSearchDetails::getReturnOrderCode).filter(Objects::nonNull).collect(Collectors.joining(",")); parentvo.setZyx19(ofsOrdersCode); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java index 92406062..cdc33d16 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java @@ -564,11 +564,91 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { childrenn.setJfybsj("-" + sum_jfbbsj); childrenn.setWbfbbje("-" + sum_wbfbbje); childrenn.setJfybwsje("-" + sum_wbfbbje); - childrenn.setZyx4(String.valueOf(sum_zyx4)); - childrenn.setZyx5(String.valueOf(sum_zyx5)); - childrenn.setZyx6(String.valueOf(sum_zyx6)); +// childrenn.setZyx4(String.valueOf(sum_zyx4)); +// childrenn.setZyx5(String.valueOf(sum_zyx5)); +// childrenn.setZyx6(String.valueOf(sum_zyx6)); children.add(childrenn); + //新增三个优惠为存货 + if(sum_zyx4.compareTo(BigDecimal.ZERO)>0){//平台优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY01"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx4); + BigDecimal sj_FY = sum_zyx4.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx4.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + if(sum_zyx5.compareTo(BigDecimal.ZERO)>0){//支付优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY04"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx5); + BigDecimal sj_FY = sum_zyx5.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx5.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + if(sum_zyx6.compareTo(BigDecimal.ZERO)>0){//达人优惠 + ArapDjzbVO.Childrenn childrennFY = new ArapDjzbVO.Childrenn(); + //cinventoryid 存货 + childrennFY.setCinventoryid("FY02"); + + //sum:jfbbje jfybje 借方本币金额/借方原币金额 + BigDecimal sum_jfbbje_FY = new BigDecimal(0); + //sum:jfbbsj jfybsj 借方本币税金/借方原币税金 默认(0.06) + BigDecimal sum_jfbbsj_FY = new BigDecimal(0); + //sum:wbfbbje jfybwsje 借方本币无税金额/借方原币无税金额 + BigDecimal sum_wbfbbje_FY = new BigDecimal(0); + + sum_jfbbje_FY = sum_jfbbje_FY.add(sum_zyx6); + BigDecimal sj_FY = sum_zyx6.multiply(new BigDecimal(0.06)).setScale(2, RoundingMode.HALF_UP); + sum_jfbbsj_FY = sum_jfbbsj_FY.add(sj_FY); + BigDecimal ws_FY = sum_zyx6.subtract(sj_FY); + sum_wbfbbje_FY = sum_wbfbbje_FY.add(ws_FY); + + childrennFY.setJfbbje("-" + sum_jfbbje_FY); + childrennFY.setJfybje("-" + sum_jfbbje_FY); + childrennFY.setJfbbsj("-" + sum_jfbbsj_FY); + childrennFY.setJfybsj("-" + sum_jfbbsj_FY); + childrennFY.setWbfbbje("-" + sum_wbfbbje_FY); + childrennFY.setJfybwsje("-" + sum_wbfbbje_FY); + children.add(childrennFY); + } + //zyx19 ofs单号 String ofsOrdersCode = vv.stream().map(RerturnGoodsOrderSearchDetails::getReturnOrderCode).filter(Objects::nonNull).collect(Collectors.joining(",")); parentvo.setZyx19(ofsOrdersCode);