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