|
|
|
@@ -107,6 +107,7 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord(); |
|
|
|
TenantEntity tenantInfo = getTenantInfo(); |
|
|
|
wxCashBackActivityRecord.updateTenantInfo(tenantInfo); |
|
|
|
wxCashBackActivityRecord.setMerchantId(getMerchantBUserId()); |
|
|
|
wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); |
|
|
|
final PageInfo<WxCashBackActivityRecord> page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -156,6 +157,7 @@ public class WxCashBackActivityController extends BaseController { |
|
|
|
WxCashBackActivityRecord r = new WxCashBackActivityRecord(); |
|
|
|
r.setActivityId(a.getId()); |
|
|
|
r.updateTenantInfo(a); |
|
|
|
r.setMerchantId(getMerchantBUserId()); |
|
|
|
int allRecordCount = wxCashBackActivityService.getRecordCount(r); |
|
|
|
|
|
|
|
r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode()); |
|
|
|
|