Browse Source

fix contract bill

release_toaliyun_real
winter 2 years ago
parent
commit
7bd4d553e2
1 changed files with 23 additions and 0 deletions
  1. +23
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 23
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java View File

@@ -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<Long> mids = wxMerchantService.findIdList(mq);
if (null != mids && mids.size() > 0 ) {
if (null != wxBillRent.getMerchantIdList()) {
List<Long> _mids = (List<Long>) 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<WxBillRent> billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillRentMapper.queryBillRentList(wxBillRent));
if (null == billRentList) {
return null;


Loading…
Cancel
Save