From bf098229c120bae4917dd5aec5b90fd6f02d1989 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 22 Nov 2024 18:49:14 +0800 Subject: [PATCH] fix --- .../domain/po/WxPropertyContract.java | 4 ++ .../iformall/domain/po/WxRentContract.java | 4 ++ .../domain/vo/WxRentPropertyContractVo.java | 4 ++ .../mapper/WxContractCustomersMapper.java | 2 + .../impl/WxPropertyContractServiceImpl.java | 35 ++++++++++++++- .../impl/WxRentContractServiceImpl.java | 34 +++++++++++++- .../WxRentPropertyContractServiceImpl.java | 44 ++++++++++++++++--- .../mapper/WxContractCustomersMapper.xml | 6 +++ .../mapper/WxPropertyContractMapper.xml | 7 +++ .../resources/mapper/WxRentContractMapper.xml | 14 ++++++ 10 files changed, 145 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 54540cd39..7cad05706 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -351,5 +351,9 @@ public class WxPropertyContract extends TenantEntity { private Long queryShopId; @TableField(exist = false) private String merchantName; + @TableField(exist = false) + private String queryShopIdStr; + @TableField(exist = false) + private List customersIdList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 85f461cc1..009e1d563 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -570,5 +570,9 @@ public class WxRentContract extends TenantEntity { private Date salesEndTime; @TableField(exist = false) private String merchantName; + @TableField(exist = false) + private String queryShopIdStr; + @TableField(exist = false) + private List customersIdList; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java index 774922aa3..3558f6013 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxRentPropertyContractVo.java @@ -109,6 +109,10 @@ public class WxRentPropertyContractVo extends TenantEntity { @TableField(exist = false) private String merchantName; + @TableField(exist = false) + private String queryShopIdStr; + @TableField(exist = false) + private List customersIdList; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxContractCustomersMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxContractCustomersMapper.java index a75ea3f9a..d8faa7f24 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxContractCustomersMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxContractCustomersMapper.java @@ -12,5 +12,7 @@ public interface WxContractCustomersMapper extends CommonMapper findList(WxContractCustomers wxShop); + List findIdList(WxContractCustomers wxShop); + WxContractCustomers selectById(@Param("id")Long id,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index ace9ebe98..f0e638770 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -111,8 +111,25 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { - if (StringUtils.isNotBlank(record.getFloorForRule())) { - List contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); + if (StringUtils.isNotBlank(record.getFloorForRule()) || StringUtils.isNotBlank(record.getQueryShopIdStr())) { + List shopIdList = null; + if (StringUtils.isNotBlank(record.getQueryShopIdStr())) { + String[] qsids = record.getQueryShopIdStr().split(","); + if (null != qsids && qsids.length > 0 ) { + shopIdList = new ArrayList(); + for (int i = 0 ; i < qsids.length ; i ++) { + String qsid = qsids[i]; + if (StringUtils.isNotBlank(qsid)) { + shopIdList.add(Long.parseLong(qsid)); + } + } + if (shopIdList.size() <= 0 ) { + shopIdList = null; + } + } + } + + List contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, shopIdList, 0); //List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); if (null == contractIds || contractIds.size() <= 0 ) { record.setId(-1L); @@ -120,6 +137,20 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService record.setIds(contractIds); } } + + //根据客户名称查询 + if (StringUtils.isNotBlank(record.getMerchantName())) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(record); + ccq.setName(record.getMerchantName()); + List customersIdList = wxContractCustomersMapper.findIdList(ccq); + if (null != customersIdList && customersIdList.size() > 0 ) { + record.setCustomersIdList(customersIdList); + }else { + record.setId(-1L); + } + } + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); if (null != pageInfo && null != pageInfo.getList() && pageInfo.getList().size() > 0 ) { List customersIdList = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 458ec7409..19fe6e08d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1704,8 +1704,25 @@ public class WxRentContractServiceImpl implements WxRentContractService { @Override public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { - if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { - List contractIds = wxAgileContractService.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, null, 0); + if (StringUtils.isNotBlank(rentContract.getFloorForRule()) || StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { + List shopIdList = null; + if (StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { + String[] qsids = rentContract.getQueryShopIdStr().split(","); + if (null != qsids && qsids.length > 0 ) { + shopIdList = new ArrayList(); + for (int i = 0 ; i < qsids.length ; i ++) { + String qsid = qsids[i]; + if (StringUtils.isNotBlank(qsid)) { + shopIdList.add(Long.parseLong(qsid)); + } + } + if (shopIdList.size() <= 0 ) { + shopIdList = null; + } + } + } + + List contractIds = wxAgileContractService.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, shopIdList, 0); //List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); if (null == contractIds || contractIds.size() <= 0 ) { rentContract.setId(-1L); @@ -1713,6 +1730,19 @@ public class WxRentContractServiceImpl implements WxRentContractService { rentContract.setIds(contractIds); } } + //根据客户名称查询 + if (StringUtils.isNotBlank(rentContract.getMerchantName())) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(rentContract); + ccq.setName(rentContract.getMerchantName()); + List customersIdList = wxContractCustomersMapper.findIdList(ccq); + if (null != customersIdList && customersIdList.size() > 0 ) { + rentContract.setCustomersIdList(customersIdList); + }else { + rentContract.setId(-1L); + } + } + //PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); if (null != pageInfo && null != pageInfo.getList()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index 47506981f..cb8e171b3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -25,6 +25,7 @@ import com.iformall.service.WxRentContractService; import com.iformall.service.WxRentPropertyContractService; import com.iformall.service.WxShopService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -71,12 +72,45 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Override public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { - List ids = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); - if (null == ids || ids.size() <= 0 ) { - record.setId(-1L); - }else { - record.setIds(ids); + if (StringUtils.isNotBlank(record.getFloorForRule()) || StringUtils.isNotBlank(record.getQueryShopIdStr())) { + List shopIdList = null; + if (StringUtils.isNotBlank(record.getQueryShopIdStr())) { + String[] qsids = record.getQueryShopIdStr().split(","); + if (null != qsids && qsids.length > 0 ) { + shopIdList = new ArrayList(); + for (int i = 0 ; i < qsids.length ; i ++) { + String qsid = qsids[i]; + if (StringUtils.isNotBlank(qsid)) { + shopIdList.add(Long.parseLong(qsid)); + } + } + if (shopIdList.size() <= 0 ) { + shopIdList = null; + } + } + } + + List contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, shopIdList, 0); + //List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); + if (null == contractIds || contractIds.size() <= 0 ) { + record.setId(-1L); + } else { + record.setIds(contractIds); + } } + //根据客户名称查询 + if (StringUtils.isNotBlank(record.getMerchantName())) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(record); + ccq.setName(record.getMerchantName()); + List customersIdList = wxContractCustomersMapper.findIdList(ccq); + if (null != customersIdList && customersIdList.size() > 0 ) { + record.setCustomersIdList(customersIdList); + }else { + record.setId(-1L); + } + } + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); if (null != pageInfo && null != pageInfo.getList() && pageInfo.getList().size() > 0 ) { List customersIdList = new ArrayList(); diff --git a/mallinkService/src/main/resources/mapper/WxContractCustomersMapper.xml b/mallinkService/src/main/resources/mapper/WxContractCustomersMapper.xml index 585204cc9..7d89d6883 100644 --- a/mallinkService/src/main/resources/mapper/WxContractCustomersMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxContractCustomersMapper.xml @@ -76,6 +76,12 @@ + +