diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index 1238a3648..ef160a235 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -99,8 +99,8 @@ public class WxBillOther extends BaseEntity { private String shopNumber; @TableField(exist = false) - @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) private String receivePayStr; + @TableField(exist = false) @Excel(name = "实收金额(元)", orderNum = "5", width = 20) private String payStr; @@ -142,4 +142,14 @@ public class WxBillOther extends BaseEntity { private String serviceChargePayBefore; @TableField(exist = false) private String serviceChargePayUpdate; + + + @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "4") + @TableField(exist = false) + private String realreceivePayStr; + + public String getRealReceivePayStr() { + return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index dbe308fab..5d08cf916 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -105,8 +105,8 @@ public class WxBillOtherDeposit extends BaseEntity { @TableField(exist = false) - @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) private String receivePayStr; + @TableField(exist = false) @Excel(name = "实收金额(元)", orderNum = "5", width = 20) private String payStr; @@ -151,4 +151,12 @@ public class WxBillOtherDeposit extends BaseEntity { private String serviceChargePayBefore; @TableField(exist = false) private String serviceChargePayUpdate; + + @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "4") + @TableField(exist = false) + private String realreceivePayStr; + + public String getRealReceivePayStr() { + return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index 712b5651f..7305e297e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -40,7 +40,6 @@ public class WxBillProperty extends BaseEntity { return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "本期账款(元)", width = 20, orderNum = "6") @TableField(exist = false) private String receivePayStr; @@ -196,4 +195,12 @@ public class WxBillProperty extends BaseEntity { private String serviceChargePayBefore; @TableField(exist = false) private String serviceChargePayUpdate; + + @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "6") + @TableField(exist = false) + private String realreceivePayStr; + + public String getRealReceivePayStr() { + return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 9735cbc4f..4d741a03a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -39,7 +39,6 @@ public class WxBillRent extends BaseEntity { return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "本期账款(元)", width = 20, orderNum = "6") @TableField(exist = false) private String receivePayStr; @@ -211,5 +210,12 @@ public class WxBillRent extends BaseEntity { @TableField(exist = false) private Long realReceivePay; + @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "6") + @TableField(exist = false) + private String realreceivePayStr; + + public String getRealReceivePayStr() { + return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java index ab2f05331..8ce0b33df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyExportVo.java @@ -19,7 +19,7 @@ public class WxBillDailyExportVo { private String merchantName; @Excel(name = "费用类型", replace = {"水费_1", "电费_2", "空调费_3"}, width = 10, orderNum = "3") private Integer type; - @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) + @Excel(name = "实际应收总金额(元)", orderNum = "4", width = 20) private String receivePayStr; @Excel(name = "实收金额(元)", orderNum = "5", width = 20) private String payStr; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index 3a756283d..c3d469ca4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -366,7 +366,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { wxBillDailyExportVo = new WxBillDailyExportVo(); wxBillDailyExportVo.setShopNumber(b.getShopNumber()); wxBillDailyExportVo.setMerchantName(b.getMerchantName()); - wxBillDailyExportVo.setReceivePay(b.getReceivePay()); + wxBillDailyExportVo.setReceivePay(b.getRealReceivePay()); wxBillDailyExportVo.setPay(b.getPay()); wxBillDailyExportVo.setOwe(b.getOwe()); wxBillDailyExportVo.setReceiveDate(b.getReceiveDate());