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