From bae33f1b9bb8bd671020250da9308c6422ca6d5e Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 22 Oct 2019 15:21:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=80=BB=E8=A7=88][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/rent/WxBillAllController.java | 2 -- .../main/java/com/iformall/domain/vo/WxBillAllVo.java | 11 ++++++++++- .../iformall/service/impl/WxBillAllServiceImpl.java | 2 -- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index fbdfcfb01..4d9718cd5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.service.WxBillAllService; @@ -54,7 +53,6 @@ public class WxBillAllController extends BaseController { @SystemControllerLog(description = "账单总览-列表") public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); - WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); if (null == wxBillAll) { wxBillAll = new WxBillAll(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index c5cce0b27..e48351551 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -32,9 +32,11 @@ public class WxBillAllVo { @Excel(name="费用类型",width = 20,orderNum = "4") private String billType; - @Excel(name="实际应收金额(元)",width = 20,orderNum = "5") private String receivePayStr; + @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "5") + private String realReceivePayStr; + @Excel(name="实收金额(元)",width = 20,orderNum = "6") private String payStr; @@ -122,6 +124,13 @@ public class WxBillAllVo { @TableField(exist = false) private Long realReceivePay; + public String getRealReceivePayStr() { + if (getRealReceivePay() != null) { + realReceivePayStr = new BigDecimal(getRealReceivePay()).divide(new BigDecimal(100)).toString(); + } + return realReceivePayStr; + } + @io.swagger.annotations.ApiModelProperty(value = "滞纳金", name = "latePayPrice") private Long latePayPrice; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index f67e368e5..c917bdb96 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -136,8 +136,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public Map listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { - //更新各账单状态 - //updateBillStatus(record); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); if (StringUtils.isNotEmpty(record.getTypeStr())) {