Browse Source

fix

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

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

@@ -109,10 +109,12 @@ public class WxCashBackActivityController extends BaseController {
//int successRecordCount = wxCashBackActivityService.getRecordCount(r); //int successRecordCount = wxCashBackActivityService.getRecordCount(r);
BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r); BigDecimal successRecordSum = wxCashBackActivityService.getRecordSum(r);
a.setAuditSuccessRecordSum(successRecordSum); a.setAuditSuccessRecordSum(successRecordSum);
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);
a.setAuditingRecordSum(auditingRecordSum); a.setAuditingRecordSum(auditingRecordSum);
a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP));
a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a));
} }
@@ -121,6 +123,7 @@ public class WxCashBackActivityController extends BaseController {
return new ResultData(page); return new ResultData(page);
} }
@ApiOperation("新增修改接口") @ApiOperation("新增修改接口")
@PostMapping("saveOrUpdate") @PostMapping("saveOrUpdate")
public ResultData saveOrUpdate(@RequestBody WxCashBackActivity wxCashBackActivity) { public ResultData saveOrUpdate(@RequestBody WxCashBackActivity wxCashBackActivity) {


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

@@ -50,7 +50,11 @@ public class WxCashBackActivity extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private BigDecimal auditSuccessRecordSum; private BigDecimal auditSuccessRecordSum;
@TableField(exist = false) @TableField(exist = false)
private BigDecimal auditSuccessRecordSumRough;
@TableField(exist = false)
private BigDecimal auditingRecordSum; private BigDecimal auditingRecordSum;
@TableField(exist = false)
private BigDecimal auditingRecordSumRough;
@TableField(exist = false) @TableField(exist = false)
private List<WxCashBackActivityItem> itemList; private List<WxCashBackActivityItem> itemList;


Loading…
Cancel
Save