|
|
|
@@ -304,11 +304,31 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId) { |
|
|
|
public List<WxCashBackActivityMerchant> getActivityMerchants(Long activityId, String tenantId,boolean hasMerchantInfo) { |
|
|
|
WxCashBackActivityMerchant m = new WxCashBackActivityMerchant(); |
|
|
|
m.setActivityId(activityId); |
|
|
|
m.setTenantId(tenantId); |
|
|
|
return wxCashBackActivityMerchantMapper.findList(m); |
|
|
|
List<WxCashBackActivityMerchant> amlist = wxCashBackActivityMerchantMapper.findList(m); |
|
|
|
if (hasMerchantInfo && null != amlist && amlist.size() > 0 ) { |
|
|
|
WxMerchant mq = new WxMerchant(); |
|
|
|
mq.setTenantId(tenantId); |
|
|
|
List<WxMerchant> mlist = wxMerchantMapper.findList(mq); |
|
|
|
Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
if (null != mlist && mlist.size() > 0 ) { |
|
|
|
for (WxMerchant _m : mlist) { |
|
|
|
merchantMap.put(_m.getId(), _m); |
|
|
|
} |
|
|
|
} |
|
|
|
for (WxCashBackActivityMerchant am : amlist) { |
|
|
|
if (null != am.getMerchantId()) { |
|
|
|
WxMerchant _mm = merchantMap.get(am.getMerchantId()); |
|
|
|
if (null != _mm) { |
|
|
|
am.setMerchant(_mm); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return amlist; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|