| @@ -116,7 +116,9 @@ public class WxBillController extends BaseController { | |||||
| */ | */ | ||||
| @GetMapping("notifyList") | @GetMapping("notifyList") | ||||
| public ResultData notifyList(@ModelAttribute WxMerchant wxMerchant) { | 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())); | return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,EnumYesOrNo.YES.getCode())); | ||||
| } | } | ||||
| @@ -129,8 +131,10 @@ public class WxBillController extends BaseController { | |||||
| */ | */ | ||||
| @GetMapping("oweBillList") | @GetMapping("oweBillList") | ||||
| public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant) { | public ResultData oweBillList(@ModelAttribute WxMerchant wxMerchant) { | ||||
| wxMerchant.setId(this.getLoginBUser().getMerchantId()); | |||||
| WxMerchantBUser buser = this.getLoginBUser(); | |||||
| wxMerchant.setId(buser.getMerchantId()); | |||||
| wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.updateTenantInfo(buser); | |||||
| return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); | return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); | ||||
| } | } | ||||
| @@ -152,7 +156,9 @@ public class WxBillController extends BaseController { | |||||
| */ | */ | ||||
| @GetMapping("nearBillList") | @GetMapping("nearBillList") | ||||
| public ResultData nearBillList(@ModelAttribute WxMerchant wxMerchant) { | 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.setOweBillBeforeDays(getOweBillBeforeDays()); | ||||
| wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); | wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); | ||||
| return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); | return new ResultData(billAllHelper.getBillNotifyList(wxMerchant,null)); | ||||