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 2b03cee3e..e04c268d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -103,12 +103,17 @@ public class WxCashBackActivityController extends BaseController { r.setActivityId(a.getId()); r.updateTenantInfo(a); int allRecordCount = wxCashBackActivityService.getRecordCount(r); + a.setRecordCount(allRecordCount); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); - int successRecordCount = wxCashBackActivityService.getRecordCount(r); + //int successRecordCount = wxCashBackActivityService.getRecordCount(r); + BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); + a.setAuditSuccessRecordSum(successRecordSum); + + r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); + BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r); + a.setAuditingRecordSum(auditingRecordSum); - a.setRecordCount(allRecordCount); - a.setAuditSuccessRecordCount(successRecordCount); a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); } } 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 6accfa897..a3b1a9eb2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -48,7 +48,9 @@ public class WxCashBackActivity extends TenantEntity { @TableField(exist = false) private Integer merchantCount; @TableField(exist = false) - private Integer auditSuccessRecordCount; + private BigDecimal auditSuccessRecordSum; + @TableField(exist = false) + private BigDecimal auditingRecordSum; @TableField(exist = false) private List itemList;