| @@ -108,11 +108,18 @@ public class WxCashBackActivityController extends BaseController { | |||||
| r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); | r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); | ||||
| //int successRecordCount = wxCashBackActivityService.getRecordCount(r); | //int successRecordCount = wxCashBackActivityService.getRecordCount(r); | ||||
| BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); | BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); | ||||
| if (null == successRecordSum) { | |||||
| successRecordSum = new BigDecimal(0); | |||||
| } | |||||
| a.setAuditSuccessRecordSum(successRecordSum); | a.setAuditSuccessRecordSum(successRecordSum); | ||||
| a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | ||||
| r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); | r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); | ||||
| BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); | BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); | ||||
| if (null == auditingRecordSum) { | |||||
| auditingRecordSum = new BigDecimal(0); | |||||
| } | |||||
| a.setAuditingRecordSum(auditingRecordSum); | a.setAuditingRecordSum(auditingRecordSum); | ||||
| a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | ||||
| @@ -123,6 +130,16 @@ public class WxCashBackActivityController extends BaseController { | |||||
| return new ResultData(page); | 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("新增修改接口") | @ApiOperation("新增修改接口") | ||||
| @PostMapping("saveOrUpdate") | @PostMapping("saveOrUpdate") | ||||