diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 8f253f683..5694557cd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -628,7 +628,7 @@ public class WxAllBillController extends BillBaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize,Boolean isList) { + public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize) { if (record == null) record = new WxAllBill(); record.updateTenantInfo(getTenantInfo()); WxUserDataRule dataRule = this.getCurrentDataFloors(); @@ -668,5 +668,27 @@ public class WxAllBillController extends BillBaseController { } wxAllBillService.exportBill(request, response, wxBillRent); } + + @ApiOperation("统计接口") + @GetMapping("sum") + public ResultData sum(@ModelAttribute WxAllBill record) { + if (record == null) record = new WxAllBill(); + record.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + record.setFloorForRule(dataRule.getFloorIds()); + record.setBusinessForRule(dataRule.getBussinessIds()); + } + if (null != record.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { + record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { + record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); + record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); + } + + } + return new ResultData(wxAllBillService.getBillMonthSum(record)); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java index ee7e1fec4..0c8890755 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillSum.java @@ -45,6 +45,14 @@ public class WxBillSum implements Serializable { private String returnPay = "0"; @TableField(exist = false) private BigDecimal returnPayNumber; + public BigDecimal getReturnPayNumber() { + if (StringUtils.isNotBlank(returnPay)) { + this.returnPayNumber = new BigDecimal(returnPay); + }else { + this.returnPayNumber = new BigDecimal(0); + } + return returnPayNumber; + } //冲抵金额 private String setOff = "0"; @@ -76,7 +84,13 @@ public class WxBillSum implements Serializable { if (StringUtils.isBlank(paid)) { paid = "0"; } - return new BigDecimal(needPay).subtract(new BigDecimal(paid)).toPlainString(); + if (StringUtils.isBlank(setOff)) { + setOff = "0"; + } + if (StringUtils.isBlank(returnPay)) { + returnPay = "0"; + } + return new BigDecimal(needPay).subtract(new BigDecimal(paid)).subtract(new BigDecimal(setOff)).add(new BigDecimal(returnPay)).toPlainString(); } public BigDecimal getOweNumber() { this.owe = getOwe();