Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
c391921124
2 zmienionych plików z 16 dodań i 2 usunięć
  1. +14
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java

+ 14
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java Wyświetl plik

@@ -23,11 +23,23 @@ public class WxBillSum implements Serializable {
private String needPay = "0"; private String needPay = "0";
@TableField(exist = false) @TableField(exist = false)
private BigDecimal needPayNumber; 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) @TableField(exist = false)
private String noTaxNeedPay = "0"; private String noTaxNeedPay = "0";
public String getNoTaxNeedPay() { 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 noTaxNeedPay;
} }
return needPay; return needPay;


+ 2
- 0
mallinkService/src/main/java/com/iformall/print/data/impl/PrintMerchantSettleItemDataHandler.java Wyświetl plik

@@ -37,6 +37,8 @@ public class PrintMerchantSettleItemDataHandler implements PrintDataParser{
return receive.getNeedPay(); return receive.getNeedPay();
}else if (name.equals("noTaxNeedPay")) { }else if (name.equals("noTaxNeedPay")) {
return receive.getNoTaxNeedPay(); return receive.getNoTaxNeedPay();
}else if (name.equals("taxNeedPay")) {
return receive.getTaxNeedPay();
}else if (name.equals("paid")) { }else if (name.equals("paid")) {
return receive.getPaid(); return receive.getPaid();
}else if (name.equals("owe")) { }else if (name.equals("owe")) {


Ładowanie…
Anuluj
Zapisz