|
|
|
@@ -64,7 +64,7 @@ public class WxMapController extends BaseController { |
|
|
|
Map<String, Object> wxMerchantObject = new HashMap<>(); |
|
|
|
Map<String, Object> wxRentContractObject = new HashMap<>(); |
|
|
|
if(wxShopObject != null && !wxShopObject.isEmpty() |
|
|
|
&& EnumShopStatus.RENT.getCode().equals(wxShopObject.get("status").toString())){ |
|
|
|
&& EnumShopStatus.RENT.getCode().toString().equals(wxShopObject.get("status").toString())){ |
|
|
|
//已出租 |
|
|
|
long shopId = Long.parseLong(wxShopObject.get("id").toString()); |
|
|
|
wxMerchantObject = wxMerchantService.detailByShopId(getTenantInfo(), shopId); |
|
|
|
@@ -88,7 +88,7 @@ public class WxMapController extends BaseController { |
|
|
|
Map<String, Object> resultMap = new HashMap<>(); |
|
|
|
Map<String, Object> wxShopObject = wxShopService.detailBySid(getTenantInfo(), sid); |
|
|
|
if(wxShopObject != null && !wxShopObject.isEmpty() |
|
|
|
&& EnumShopStatus.RENT.getCode().equals(wxShopObject.get("status").toString())){ |
|
|
|
&& EnumShopStatus.RENT.getCode().toString().equals(wxShopObject.get("status").toString())){ |
|
|
|
//已出租 |
|
|
|
long shopId = Long.parseLong(wxShopObject.get("id").toString()); |
|
|
|
Map<String, Object> wxMerchantObject = wxMerchantService.detailByShopId(getTenantInfo(), shopId); |
|
|
|
|