From 0526b9dd26b396af07a32a2cbe6120afd21ae4d9 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 3 Mar 2024 13:54:28 +0800 Subject: [PATCH] fix --- .../market/WxCashBackActivityController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index 9e1b52337..e44f162f3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -108,11 +108,18 @@ public class WxCashBackActivityController extends BaseController { r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); //int successRecordCount = wxCashBackActivityService.getRecordCount(r); BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); + if (null == successRecordSum) { + successRecordSum = new BigDecimal(0); + } a.setAuditSuccessRecordSum(successRecordSum); a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); + if (null == auditingRecordSum) { + auditingRecordSum = new BigDecimal(0); + } + a.setAuditingRecordSum(auditingRecordSum); a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); @@ -123,6 +130,16 @@ public class WxCashBackActivityController extends BaseController { return new ResultData(page); } + @ApiOperation("分页列表接口") + @GetMapping("auditingCount") + public ResultData auditingCount() { + WxCashBackActivityRecord r = new WxCashBackActivityRecord(); + r.updateTenantInfo(this.getTenantInfo()); + r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); + int rc = wxCashBackActivityService.getRecordCount(r); + return new ResultData(rc); + } + @ApiOperation("新增修改接口") @PostMapping("saveOrUpdate")