From 597c0cca5b49625c4016d26edb2af7e0a5e05bdb Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 21 Nov 2024 17:26:57 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxPropertyContract.java | 3 --- .../mapper/WxPropertyContractMapper.java | 2 -- .../impl/WxPropertyContractServiceImpl.java | 13 +++++++++---- .../mapper/WxPropertyContractMapper.xml | 18 ------------------ 4 files changed, 9 insertions(+), 27 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 099dca5fd..cd01ab77f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -341,9 +341,6 @@ public class WxPropertyContract extends TenantEntity { return null; } - @TableField(exist = false) - private List merchantIds; - @TableField(exist = false) List feeStandards; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java index 404940a24..75ae5bba6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPropertyContractMapper.java @@ -30,8 +30,6 @@ public interface WxPropertyContractMapper extends CommonMapper getRentContractListByShop(Map params); 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 8a27ea743..144b66273 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -85,6 +85,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Lazy @Autowired WxRentContractService wxRentContractService; + + @Lazy + @Autowired + WxAgileContractService wxAgileContractService; @Lazy @Autowired @@ -108,11 +112,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override public PageInfo listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { if (StringUtils.isNotBlank(record.getFloorForRule())) { - List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); - if (null == mids || mids.size() <= 0 ) { - record.setId(-1L); + List contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); + //List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); + if (null == contractIds || contractIds.size() <= 0 ) { + record.setId(-1L); } else { - record.setMerchantIds(mids); + record.setIds(contractIds); } } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index 50c8304f9..55ed32cdc 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -122,13 +122,6 @@ and business_id in (${businessForRule}) - - and merchant_id in - - #{mItem} - - - and id in @@ -227,17 +220,6 @@ and rental_end_date <now() - - update wx_property_contract set status=#{status} where status!=7 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and merchant_id is null - - update wx_property_contract set apply_status=#{applyStatus} ,business_type=#{businessType}