diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 8eafb6a73..728cb8ccc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1649,9 +1649,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { public List findMerchantVoList(Long couponId,String city,TenantEntity tenantEntity,boolean hasShop) { List couponIds = new ArrayList(); couponIds.add(couponId); - TtMerchantPoi poiQ = new TtMerchantPoi(); - poiQ.setCity(city); - Map> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiQ,hasShop); + List poiMerchantIds = null; + if (StringUtils.isNotBlank(city)) { + TtMerchantPoi poiQ = new TtMerchantPoi(); + poiQ.setCity(city); + poiQ.updateTenantInfo(tenantEntity); + poiMerchantIds = ttMerchantPoiMapper.findIdList(poiQ); + } + + Map> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiMerchantIds,hasShop); if (null != couponMerchantVoList) { return couponMerchantVoList.get(couponId); }