소스 검색

fix bug

release_toaliyun_real
lin 2 년 전
부모
커밋
e30cc30624
1개의 변경된 파일9개의 추가작업 그리고 3개의 파일을 삭제
  1. +9
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 9
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java 파일 보기

@@ -1649,9 +1649,15 @@ public class WxMerchantServiceImpl implements WxMerchantService {
public List<WxMerchantVo> findMerchantVoList(Long couponId,String city,TenantEntity tenantEntity,boolean hasShop) { public List<WxMerchantVo> findMerchantVoList(Long couponId,String city,TenantEntity tenantEntity,boolean hasShop) {
List<Long> couponIds = new ArrayList<Long>(); List<Long> couponIds = new ArrayList<Long>();
couponIds.add(couponId); couponIds.add(couponId);
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.setCity(city);
Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiQ,hasShop);
List<Long> poiMerchantIds = null;
if (StringUtils.isNotBlank(city)) {
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.setCity(city);
poiQ.updateTenantInfo(tenantEntity);
poiMerchantIds = ttMerchantPoiMapper.findIdList(poiQ);
}
Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,poiMerchantIds,hasShop);
if (null != couponMerchantVoList) { if (null != couponMerchantVoList) {
return couponMerchantVoList.get(couponId); return couponMerchantVoList.get(couponId);
} }


불러오는 중...
취소
저장