| @@ -943,7 +943,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| Map<String,List<Long>> mallBUserIdList = new HashMap<String,List<Long>>(); | Map<String,List<Long>> mallBUserIdList = new HashMap<String,List<Long>>(); | ||||
| Map<String,List<Long>> mallMerchantIdList = new HashMap<String,List<Long>>(); | Map<String,List<Long>> mallMerchantIdList = new HashMap<String,List<Long>>(); | ||||
| List<Long> couponIdList = new ArrayList<Long>(); | List<Long> couponIdList = new ArrayList<Long>(); | ||||
| List<String> mallTenantIdList = new ArrayList<String>(); | List<String> mallTenantIdList = new ArrayList<String>(); | ||||
| mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); | mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); | ||||
| //查询子广场 | //查询子广场 | ||||
| @@ -985,8 +985,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| if (null == merchantIds) { | if (null == merchantIds) { | ||||
| merchantIds = new ArrayList<Long>(); | merchantIds = new ArrayList<Long>(); | ||||
| } | } | ||||
| if(null != bo.getMerchantId() && (!merchantIds.contains(bo.getMerchantId()))){ | |||||
| merchantIds.add(bo.getMerchantId()); | |||||
| if(null != bo.getBMerchantId() && (!merchantIds.contains(bo.getBMerchantId()))){ | |||||
| merchantIds.add(bo.getBMerchantId()); | |||||
| } | } | ||||
| mallMerchantIdList.put(bo.getBTenantId(), merchantIds); | mallMerchantIdList.put(bo.getBTenantId(), merchantIds); | ||||
| } | } | ||||