Bladeren bron

fix

release_toaliyun_real
winter 1 jaar geleden
bovenliggende
commit
249f2ab5e4
1 gewijzigde bestanden met toevoegingen van 9 en 3 verwijderingen
  1. +9
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java

+ 9
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Bestand weergeven

@@ -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));


Laden…
Annuleren
Opslaan