From c3919211243e48adba6fe2eb82fe653b51353a9b Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 17 Aug 2024 13:10:09 +0800 Subject: [PATCH] fix --- .../java/com/iformall/domain/vo/WxBillSum.java | 16 ++++++++++++++-- .../impl/PrintMerchantSettleItemDataHandler.java | 2 ++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index a6c48cfb0..bf4a7f358 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -23,11 +23,23 @@ public class WxBillSum implements Serializable { private String needPay = "0"; @TableField(exist = false) private BigDecimal needPayNumber; + @TableField(exist = false) + private String taxNeedPay; + public String getTaxNeedPay() { + if (StringUtils.isNotBlank(taxRate)) { + taxNeedPay = new BigDecimal(needPay).multiply(new BigDecimal(taxRate)).divide(new BigDecimal(100)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString(); + }else { + taxNeedPay = ""; + } + return taxNeedPay; + } + @TableField(exist = false) private String noTaxNeedPay = "0"; public String getNoTaxNeedPay() { - if (StringUtils.isNotBlank(taxRate)) { - noTaxNeedPay = new BigDecimal(needPay).divide(new BigDecimal(taxRate).divide(new BigDecimal(100)).add(new BigDecimal(1)),6,BigDecimal.ROUND_HALF_UP).toPlainString(); + String taxpay = getTaxNeedPay(); + if (StringUtils.isNotBlank(taxpay)) { + noTaxNeedPay = new BigDecimal(needPay).subtract(new BigDecimal(taxpay)).setScale(6,BigDecimal.ROUND_HALF_UP).toPlainString(); return noTaxNeedPay; } return needPay; diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java index 0694f54a0..b3ed58f92 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java @@ -37,6 +37,8 @@ public class PrintMerchantSettleItemDataHandler implements PrintDataParser{ return receive.getNeedPay(); }else if (name.equals("noTaxNeedPay")) { return receive.getNoTaxNeedPay(); + }else if (name.equals("taxNeedPay")) { + return receive.getTaxNeedPay(); }else if (name.equals("paid")) { return receive.getPaid(); }else if (name.equals("owe")) {