From 84aef81e6b54bb8700147df0b169bef51a7ebfbe Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 25 Aug 2021 18:41:36 +0800 Subject: [PATCH] rent --- .../java/com/iformall/controller/basic/WxMapController.java | 3 ++- .../main/java/com/iformall/service/WxRentContractService.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 ++- .../src/main/resources/mapper/WxRentContractMapper.xml | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java index 300567979..336ca5439 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java @@ -67,10 +67,11 @@ public class WxMapController extends BaseController { && EnumShopStatus.RENT.getCode().toString().equals(wxShopObject.get("status").toString())){ //已出租 long shopId = Long.parseLong(wxShopObject.get("id").toString()); + String shopNumber = wxShopObject.get("shopNumber").toString(); wxMerchantObject = wxMerchantService.detailByShopId(getTenantInfo(), shopId); if(wxMerchantObject != null && !wxMerchantObject.isEmpty()){ long merchantId = Long.parseLong(wxMerchantObject.get("id").toString()); - wxRentContractObject = wxRentContractService.currentValidByMerchantId(getTenantInfo(),merchantId); + wxRentContractObject = wxRentContractService.currentValidByMerchantId(getTenantInfo(),merchantId,shopNumber); } } resultObject.put("wxShop",wxShopObject); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index 90b739f54..52fbcc45d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -128,5 +128,5 @@ public interface WxRentContractService { @Deprecated Map findRentByShop(Long shopId); - Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId); + Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId,String shopNumber); } 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 2e18f5dfa..b677e93cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -3215,10 +3215,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { } @Override - public Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId) { + public Map currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId,String shopNumber) { WxRentContract rentContract = new WxRentContract(); rentContract.updateTenantInfo(tenantInfo); rentContract.setMerchantId(merchantId); + rentContract.setShopNumber(shopNumber); List statuss = new ArrayList<>(); statuss.add(EnumRentContractStatus.READY_FOR_PAING.getCode()); statuss.add(EnumRentContractStatus.PAING.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 49397fdc3..b6365399d 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -818,6 +818,9 @@ and rc.`parent_tenant_id` = #{parentTenantId} and rc.`merchant_id` = #{merchantId} + + and rc.shop_name like concat('%',#{shopNumber},'%') + and rc.`rental_start_date` <= now() and rc.rental_end_date >= now() and rc.`status` in