| @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONArray; | |||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.WxPayAccountBill; | |||||
| import com.iformall.domain.vo.WxBillAll; | import com.iformall.domain.vo.WxBillAll; | ||||
| import com.iformall.domain.vo.WxBillExcelTemplate; | import com.iformall.domain.vo.WxBillExcelTemplate; | ||||
| import com.iformall.service.WxBillAllService; | import com.iformall.service.WxBillAllService; | ||||
| @@ -54,7 +53,6 @@ public class WxBillAllController extends BaseController { | |||||
| @SystemControllerLog(description = "账单总览-列表") | @SystemControllerLog(description = "账单总览-列表") | ||||
| public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); | logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); | ||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId()); | |||||
| if (null == wxBillAll) { | if (null == wxBillAll) { | ||||
| wxBillAll = new WxBillAll(); | wxBillAll = new WxBillAll(); | ||||
| } | } | ||||
| @@ -32,9 +32,11 @@ public class WxBillAllVo { | |||||
| @Excel(name="费用类型",width = 20,orderNum = "4") | @Excel(name="费用类型",width = 20,orderNum = "4") | ||||
| private String billType; | private String billType; | ||||
| @Excel(name="实际应收金额(元)",width = 20,orderNum = "5") | |||||
| private String receivePayStr; | private String receivePayStr; | ||||
| @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "5") | |||||
| private String realReceivePayStr; | |||||
| @Excel(name="实收金额(元)",width = 20,orderNum = "6") | @Excel(name="实收金额(元)",width = 20,orderNum = "6") | ||||
| private String payStr; | private String payStr; | ||||
| @@ -122,6 +124,13 @@ public class WxBillAllVo { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long realReceivePay; | 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") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金", name = "latePayPrice") | ||||
| private Long latePayPrice; | private Long latePayPrice; | ||||
| } | } | ||||
| @@ -136,8 +136,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| @Override | @Override | ||||
| public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { | public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) { | ||||
| //更新各账单状态 | |||||
| //updateBillStatus(record); | |||||
| WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); | WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(record.getTenantId()); | ||||
| if (StringUtils.isNotEmpty(record.getTypeStr())) { | if (StringUtils.isNotEmpty(record.getTypeStr())) { | ||||