Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
adbac4cd06
2 changed files with 12 additions and 0 deletions
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java View File

@@ -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));
}
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java View File

@@ -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<WxCashBackActivityItem> itemList;


Loading…
Cancel
Save