From 07698242224f37485db7371866d5f8fb5ddebdbe Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 15:10:32 +0800 Subject: [PATCH] fix bug --- .../com/iformall/controller/WxCashBackActivityController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java index 19a856144..31b1351bb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashBackActivityController.java @@ -107,7 +107,7 @@ public class WxCashBackActivityController extends BaseController { if (null == wxCashBackActivityRecord) wxCashBackActivityRecord = new WxCashBackActivityRecord(); TenantEntity tenantInfo = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantInfo); - wxCashBackActivityRecord.setMerchantId(getMerchantBUserId()); + wxCashBackActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); wxCashBackActivityRecord.setSortColumns(SortField.CreateDate_DESC); final PageInfo page = wxCashBackActivityService.listActivityRecordAsPage(wxCashBackActivityRecord, pageNum, pageSize); return new ResultData(page); @@ -157,7 +157,7 @@ public class WxCashBackActivityController extends BaseController { WxCashBackActivityRecord r = new WxCashBackActivityRecord(); r.setActivityId(a.getId()); r.updateTenantInfo(a); - r.setMerchantId(getMerchantBUserId()); + r.setMerchantId(getLoginBUser().getMerchantId()); int allRecordCount = wxCashBackActivityService.getRecordCount(r); r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDI_SUCCESS.getCode());