From 10e7af387575b5a13542a1e03d0768af550b697d Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 14 Aug 2024 11:01:10 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxFinanceReceive.java | 36 ++++++++++++++++++- .../impl/PrintFinanceReceiveDataHandler.java | 17 +++------ 2 files changed, 39 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 5668d9061..fb986e328 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -7,6 +7,7 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumFinanceCashierType; import com.iformall.enums.EnumFinanceReceiveStatus; import com.iformall.enums.EnumFinanceReceiveType; +import com.iformall.utils.PriceUtilV2; import lombok.Data; import lombok.EqualsAndHashCode; @@ -48,13 +49,37 @@ public class WxFinanceReceive extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "receiveMoney") private String receiveMoney; + @TableField(exist = false) + private String receiveMoneyChinese; + public String getReceiveMoneyChinese() { + if (StringUtils.isNotBlank(receiveMoney)) { + receiveMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receiveMoney)); + } + return receiveMoneyChinese; + } @io.swagger.annotations.ApiModelProperty(value = "支付给商户金额", name = "payMoney") private String payMoney; + @TableField(exist = false) + private String payMoneyChinese; + public String getPayMoneyChinese() { + if (StringUtils.isNotBlank(payMoney)) { + payMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(payMoney)); + } + return payMoneyChinese; + } //跟useMoney的区别是,这个字段是记录此次收款冲抵了多少费用。useMoney是使用了自身多少的实收金额,预充用的到 @io.swagger.annotations.ApiModelProperty(value = "冲抵金额", name = "setOffMoney") private String setOffMoney; + @TableField(exist = false) + private String setOffMoneyChinese; + public String getSetOffMoneyChinese() { + if (StringUtils.isNotBlank(setOffMoney)) { + setOffMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(setOffMoney)); + } + return setOffMoneyChinese; + } @io.swagger.annotations.ApiModelProperty(value = "已使用金额,冲抵里面使用", name = "useMoney") private String useMoney; @@ -69,6 +94,8 @@ public class WxFinanceReceive extends TenantEntity { return new BigDecimal(receiveMoney).subtract(new BigDecimal(useMoney)).toPlainString(); } + @TableField(exist = false) + private String allReceiveMoney; public String getAllReceiveMoney() { if (StringUtils.isBlank(receiveMoney)) { receiveMoney = "0"; @@ -76,7 +103,14 @@ public class WxFinanceReceive extends TenantEntity { if (StringUtils.isBlank(setOffMoney)) { setOffMoney = "0"; } - return new BigDecimal(receiveMoney).add(new BigDecimal(setOffMoney)).toPlainString(); + allReceiveMoney = new BigDecimal(receiveMoney).add(new BigDecimal(setOffMoney)).toPlainString(); + return allReceiveMoney; + } + @TableField(exist = false) + private String allReceiveMoneyChinese; + public String getAllReceiveMoneyChinese() { + allReceiveMoneyChinese = PriceUtilV2.number2CNMontrayUnit(new BigDecimal(getAllReceiveMoney())); + return allReceiveMoneyChinese; } @io.swagger.annotations.ApiModelProperty(value = "状态EnumFinanceReceiveStatus", name = "status") diff --git a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java index 6ec0f93fa..448ad2341 100644 --- a/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java +++ b/mallinkService/src/main/java/com/iformall/print/data/impl/PrintFinanceReceiveDataHandler.java @@ -39,28 +39,19 @@ public class PrintFinanceReceiveDataHandler implements PrintDataParser{ }else if (name.equals("receiveMoney")) { return receive.getReceiveMoney(); }else if (name.equals("receiveMoneyChinese")) { - if (StringUtils.isNotBlank(receive.getReceiveMoney())) { - return PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receive.getReceiveMoney())); - } - return ""; + return receive.getReceiveMoneyChinese(); }else if (name.equals("payMoney")) { return receive.getPayMoney(); }else if (name.equals("payMoneyChinese")) { - if (StringUtils.isNotBlank(receive.getPayMoney())) { - return PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receive.getPayMoney())); - } - return ""; + return receive.getPayMoneyChinese(); }else if (name.equals("setOffMoney")) { return receive.getSetOffMoney(); }else if (name.equals("setOffMoneyChinese")) { - if (StringUtils.isNotBlank(receive.getSetOffMoney())) { - return PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receive.getSetOffMoney())); - } - return ""; + return receive.getSetOffMoneyChinese(); }else if (name.equals("allReceiveMoney")) { return receive.getAllReceiveMoney(); }else if (name.equals("allReceiveMoneyChinese")) { - return PriceUtilV2.number2CNMontrayUnit(new BigDecimal(receive.getAllReceiveMoney())); + return receive.getAllReceiveMoneyChinese(); }else if (name.equals("useMoney")) { return receive.getUseMoney(); }else if (name.equals("receiveTypeName")) {