From 7bd4d553e2cd19e2f2024686096a0f1ea04eb549 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 28 Apr 2024 10:03:57 +0800 Subject: [PATCH] fix contract bill --- .../service/impl/WxBillRentServiceImpl.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 63b0fb525..845627f34 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -16,6 +16,8 @@ import com.iformall.mapper.*; import com.iformall.service.*; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; + +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.joda.time.DateTime; import org.joda.time.Months; @@ -482,6 +484,27 @@ public class WxBillRentServiceImpl implements WxBillRentService { } } + if (StringUtils.isNotBlank(wxBillRent.getMerchantName())) { + WxMerchant mq = new WxMerchant(); + mq.updateTenantInfo(wxBillRent); + mq.setName(StringUtils.trimToNull(wxBillRent.getMerchantName())); + List mids = wxMerchantService.findIdList(mq); + if (null != mids && mids.size() > 0 ) { + if (null != wxBillRent.getMerchantIdList()) { + List _mids = (List) CollectionUtils.intersection(mids, wxBillRent.getMerchantIdList()); + if (null == _mids || _mids.size() <= 0) { + wxBillRent.setId(-1L); + }else { + wxBillRent.setMerchantIdList(_mids); + } + }else { + wxBillRent.setMerchantIdList(mids); + } + }else { + wxBillRent.setId(-1L); + } + } + PageInfo billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.queryBillRentList(wxBillRent)); if (null == billRentList) { return null;