| @@ -99,8 +99,8 @@ public class WxBillOther extends BaseEntity { | |||||
| private String shopNumber; | private String shopNumber; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) | |||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | ||||
| private String payStr; | private String payStr; | ||||
| @@ -142,4 +142,14 @@ public class WxBillOther extends BaseEntity { | |||||
| private String serviceChargePayBefore; | private String serviceChargePayBefore; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String serviceChargePayUpdate; | 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(); | |||||
| } | |||||
| } | } | ||||
| @@ -105,8 +105,8 @@ public class WxBillOtherDeposit extends BaseEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) | |||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | ||||
| private String payStr; | private String payStr; | ||||
| @@ -151,4 +151,12 @@ public class WxBillOtherDeposit extends BaseEntity { | |||||
| private String serviceChargePayBefore; | private String serviceChargePayBefore; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String serviceChargePayUpdate; | 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(); | |||||
| } | |||||
| } | } | ||||
| @@ -40,7 +40,6 @@ public class WxBillProperty extends BaseEntity { | |||||
| return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @Excel(name = "本期账款(元)", width = 20, orderNum = "6") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @@ -196,4 +195,12 @@ public class WxBillProperty extends BaseEntity { | |||||
| private String serviceChargePayBefore; | private String serviceChargePayBefore; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String serviceChargePayUpdate; | 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(); | |||||
| } | |||||
| } | } | ||||
| @@ -39,7 +39,6 @@ public class WxBillRent extends BaseEntity { | |||||
| return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(receivePay == null ? 0 : receivePay).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @Excel(name = "本期账款(元)", width = 20, orderNum = "6") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @@ -211,5 +210,12 @@ public class WxBillRent extends BaseEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long realReceivePay; | 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(); | |||||
| } | |||||
| } | } | ||||
| @@ -19,7 +19,7 @@ public class WxBillDailyExportVo { | |||||
| private String merchantName; | private String merchantName; | ||||
| @Excel(name = "费用类型", replace = {"水费_1", "电费_2", "空调费_3"}, width = 10, orderNum = "3") | @Excel(name = "费用类型", replace = {"水费_1", "电费_2", "空调费_3"}, width = 10, orderNum = "3") | ||||
| private Integer type; | private Integer type; | ||||
| @Excel(name = "实际应收金额(元)", orderNum = "4", width = 20) | |||||
| @Excel(name = "实际应收总金额(元)", orderNum = "4", width = 20) | |||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | @Excel(name = "实收金额(元)", orderNum = "5", width = 20) | ||||
| private String payStr; | private String payStr; | ||||
| @@ -366,7 +366,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { | |||||
| wxBillDailyExportVo = new WxBillDailyExportVo(); | wxBillDailyExportVo = new WxBillDailyExportVo(); | ||||
| wxBillDailyExportVo.setShopNumber(b.getShopNumber()); | wxBillDailyExportVo.setShopNumber(b.getShopNumber()); | ||||
| wxBillDailyExportVo.setMerchantName(b.getMerchantName()); | wxBillDailyExportVo.setMerchantName(b.getMerchantName()); | ||||
| wxBillDailyExportVo.setReceivePay(b.getReceivePay()); | |||||
| wxBillDailyExportVo.setReceivePay(b.getRealReceivePay()); | |||||
| wxBillDailyExportVo.setPay(b.getPay()); | wxBillDailyExportVo.setPay(b.getPay()); | ||||
| wxBillDailyExportVo.setOwe(b.getOwe()); | wxBillDailyExportVo.setOwe(b.getOwe()); | ||||
| wxBillDailyExportVo.setReceiveDate(b.getReceiveDate()); | wxBillDailyExportVo.setReceiveDate(b.getReceiveDate()); | ||||