|
|
|
@@ -29,10 +29,36 @@ public class WxCouponMallServiceImpl implements WxCouponMallService { |
|
|
|
TtCouponChannelPoiMapper ttCouponChannelPoiMapper; |
|
|
|
@Autowired |
|
|
|
WxCouponChannelMapper wxCouponChannelMapper; |
|
|
|
@Autowired |
|
|
|
WxMallMapper wxMallMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxCouponMall> list(WxCouponMall wxCouponMall){ |
|
|
|
return wxCouponMallMapper.findList(wxCouponMall); |
|
|
|
public List<WxCouponMall> list(WxCouponMall wxCouponMall,boolean queryMall){ |
|
|
|
List<WxCouponMall> list = wxCouponMallMapper.findList(wxCouponMall); |
|
|
|
if (queryMall) { |
|
|
|
if (null != list && list.size() > 0 ) { |
|
|
|
List<String> mallTenantList = new ArrayList<String>();; |
|
|
|
for (int i = 0 ;i <list.size() ; i++) { |
|
|
|
String mt = list.get(i).getMallTenantId(); |
|
|
|
if (!mallTenantList.contains(mt)) { |
|
|
|
mallTenantList.add(mt); |
|
|
|
} |
|
|
|
} |
|
|
|
WxMall mallq = new WxMall(); |
|
|
|
mallq.setTenantIdList(mallTenantList); |
|
|
|
List<WxMall> mallList = wxMallMapper.findList(mallq); |
|
|
|
if (null != mallList && mallList.size() > 0) { |
|
|
|
Map<String,WxMall> mallMap = new HashMap<String,WxMall>(); |
|
|
|
for (WxMall m:mallList) { |
|
|
|
mallMap.put(m.getTenantId(), m); |
|
|
|
} |
|
|
|
for (WxCouponMall cm : list) { |
|
|
|
cm.setMall(mallMap.get(cm.getMallTenantId())); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return list; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|