From 249f2ab5e401c5ee6a08d321a1b2c461792d579d Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 2 Sep 2024 13:45:23 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/WxBillController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index d2c73405b..e1d0ddf35 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -116,7 +116,9 @@ public class WxBillController extends BaseController { */ @GetMapping("notifyList") public ResultData notifyList(@ModelAttribute WxMerchant wxMerchant) { - wxMerchant.setId(this.getLoginBUser().getMerchantId()); + WxMerchantBUser buser = this.getLoginBUser(); + wxMerchant.setId(buser.getMerchantId()); + wxMerchant.updateTenantInfo(buser); return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,EnumYesOrNo.YES.getCode())); } @@ -129,8 +131,10 @@ public class WxBillController extends BaseController { */ @GetMapping("oweBillList") public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant) { - wxMerchant.setId(this.getLoginBUser().getMerchantId()); + WxMerchantBUser buser = this.getLoginBUser(); + wxMerchant.setId(buser.getMerchantId()); wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); + wxMerchant.updateTenantInfo(buser); return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); } @@ -152,7 +156,9 @@ public class WxBillController extends BaseController { */ @GetMapping("nearBillList") public ResultData nearBillList(@ModelAttribute WxMerchant wxMerchant) { - wxMerchant.setId(this.getLoginBUser().getMerchantId()); + WxMerchantBUser buser = this.getLoginBUser(); + wxMerchant.updateTenantInfo(buser); + wxMerchant.setId(buser.getMerchantId()); wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null));