diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java index 9a6746305..0d0ab01e1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxShop.java @@ -12,6 +12,7 @@ import lombok.ToString; import java.math.BigDecimal; import java.util.Date; +import java.util.List; @TableName(value = "wx_shop") @Data @@ -20,7 +21,9 @@ import java.util.Date; public class WxShop extends TenantEntity { protected Long id; - + + @TableField(exist = false) + private List notInIdList; @TableField(exist = false) private Long rentContractId; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 5723998a4..993d8982f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -59,4 +59,6 @@ public interface WxRentContractMapper extends CommonMapper List> currentValidByMerchantId(WxRentContract rentContract); + List getUsedRentShopIds(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 5c0bfca67..0a06d197a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -475,6 +475,12 @@ public class WxShopServiceImpl implements WxShopService { @Override public PageInfo> listShopFromContract(WxShop wxShop, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); + WxRentContract wxRentContractQ = new WxRentContract(); + wxRentContractQ.updateTenantInfo(wxShop); + List usedShopIds = wxRentContractMapper.getUsedRentShopIds(wxRentContractQ); + if (null != usedShopIds && usedShopIds.size() > 0 ) { + wxShop.setNotInIdList(usedShopIds); + } List> shops = wxShopMapper.listShopFromContract(wxShop); if (null != shops) { Map floorMap = this.getFloorMap(wxShop); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 0332d54ca..f2850e981 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -536,6 +536,17 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index e0e4d3253..c6c9d002f 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -461,16 +461,11 @@ and s.`status` = #{status} - + and s.id not in( - SELECT shop_id FROM wx_rent_contract WHERE status in(1,2,3,4,8) - and rent_shop_type=2 - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - + + #{notInIdItem} + )