From 85794d55ac009bb2ade422818089c4d950fcd312 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 5 Sep 2024 10:34:20 +0800 Subject: [PATCH] fix --- .../com/iformall/controller/rent/WxAllBillController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 3710393ac..303b87079 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -700,7 +700,9 @@ public class WxAllBillController extends BillBaseController { } wxMerchant.setIsPreview(EnumYesOrNo.NO.getCode()); wxMerchant.updateTenantInfo(getTenantInfo()); - wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); + if (null == wxMerchant.getAdvanceHasMoney()) { + wxMerchant.setToPayMerchant(EnumYesOrNo.YES.getCode()); + } List list = billAllHelper.getMerchantBillList(wxMerchant); if (null != list && list.size() > 0 ) { List merchnatIds = new ArrayList();