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 81a09f4d3..43cc3c61c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -124,6 +124,14 @@ public class WxCashBackActivityController extends BaseController { a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); + + r.setAuditStatus(null); + BigDecimal mrchantSum = wxCashBackActivityService.getRecordMerchantSum(r); + if (null == mrchantSum) { + mrchantSum = new BigDecimal(0); + } + a.setMerchantRecordSum(mrchantSum); + a.setMerchantRecordSumRough(mrchantSum.setScale(0,BigDecimal.ROUND_HALF_UP)); } } 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 01ba06c39..0c2a272fc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -55,6 +55,10 @@ public class WxCashBackActivity extends TenantEntity { private BigDecimal auditingRecordSum; @TableField(exist = false) private BigDecimal auditingRecordSumRough; + @TableField(exist = false) + private BigDecimal merchantRecordSum; + @TableField(exist = false) + private BigDecimal merchantRecordSumRough; @TableField(exist = false) private List itemList;