From 805e272b34a1046c307798e1ab3cba342989c626 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 2 Mar 2024 22:37:50 +0800 Subject: [PATCH] fix --- .../controller/market/WxCashBackActivityController.java | 3 +++ .../main/java/com/iformall/domain/po/WxCashBackActivity.java | 4 ++++ 2 files changed, 7 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 e04c268d5..9e1b52337 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -109,10 +109,12 @@ public class WxCashBackActivityController extends BaseController { //int successRecordCount = wxCashBackActivityService.getRecordCount(r); BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); a.setAuditSuccessRecordSum(successRecordSum); + a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); a.setAuditingRecordSum(auditingRecordSum); + a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); } @@ -121,6 +123,7 @@ public class WxCashBackActivityController extends BaseController { return new ResultData(page); } + @ApiOperation("新增修改接口") @PostMapping("saveOrUpdate") public ResultData saveOrUpdate(@RequestBody WxCashBackActivity wxCashBackActivity) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index a3b1a9eb2..01ba06c39 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -50,7 +50,11 @@ public class WxCashBackActivity extends TenantEntity { @TableField(exist = false) private BigDecimal auditSuccessRecordSum; @TableField(exist = false) + private BigDecimal auditSuccessRecordSumRough; + @TableField(exist = false) private BigDecimal auditingRecordSum; + @TableField(exist = false) + private BigDecimal auditingRecordSumRough; @TableField(exist = false) private List itemList;