Browse Source

rent

release_toaliyun_real
xhxu 4 years ago
parent
commit
84aef81e6b
4 changed files with 8 additions and 3 deletions
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMapController.java View File

@@ -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);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -128,5 +128,5 @@ public interface WxRentContractService {
@Deprecated
Map<String, Object> findRentByShop(Long shopId);

Map<String, Object> currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId);
Map<String, Object> currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId,String shopNumber);
}

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -3215,10 +3215,11 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

@Override
public Map<String, Object> currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId) {
public Map<String, Object> currentValidByMerchantId(TenantEntity tenantInfo, Long merchantId,String shopNumber) {
WxRentContract rentContract = new WxRentContract();
rentContract.updateTenantInfo(tenantInfo);
rentContract.setMerchantId(merchantId);
rentContract.setShopNumber(shopNumber);
List<Integer> statuss = new ArrayList<>();
statuss.add(EnumRentContractStatus.READY_FOR_PAING.getCode());
statuss.add(EnumRentContractStatus.PAING.getCode());


+ 3
- 0
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml View File

@@ -818,6 +818,9 @@
and rc.`parent_tenant_id` = #{parentTenantId}
</if>
and rc.`merchant_id` = #{merchantId}
<if test=" null != shopNumber and shopNumber!=''">
and rc.shop_name like concat('%',#{shopNumber},'%')
</if>
and rc.`rental_start_date` &lt;= now() and rc.rental_end_date >= now()
<if test=" null != statuss ">
and rc.`status` in


Loading…
Cancel
Save