| @@ -392,6 +392,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| List<Long> cUserIdList = new ArrayList<Long>(); | List<Long> cUserIdList = new ArrayList<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()); | |||||
| //查询子广场 | |||||
| WxMall wxMallq = new WxMall(); | |||||
| wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId()); | |||||
| List<WxMall> mallList = wxMallMapper.findList(wxMallq); | |||||
| if ( null != mallList && mallList.size() > 0 ) { | |||||
| for (WxMall mall : mallList) { | |||||
| mallTenantIdList.add(mall.getTenantId()); | |||||
| } | |||||
| } | |||||
| for (int j = 0 ; j < couponOrderList.size(); j ++) { | for (int j = 0 ; j < couponOrderList.size(); j ++) { | ||||
| WxCouponOrder co = couponOrderList.get(j); | WxCouponOrder co = couponOrderList.get(j); | ||||
| Long bUserId = co.getBUserId(); | Long bUserId = co.getBUserId(); | ||||
| @@ -402,13 +412,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| if (null == bUserIdList) { | if (null == bUserIdList) { | ||||
| bUserIdList = new ArrayList<Long>(); | bUserIdList = new ArrayList<Long>(); | ||||
| } | } | ||||
| if (bUserIdList.contains(bUserId)) { | |||||
| if (!bUserIdList.contains(bUserId)) { | |||||
| bUserIdList.add(bUserId); | bUserIdList.add(bUserId); | ||||
| } | } | ||||
| mallBUserIdList.put(mallTenantId, bUserIdList); | mallBUserIdList.put(mallTenantId, bUserIdList); | ||||
| if (!mallTenantIdList.contains(mallTenantId)) { | |||||
| mallTenantIdList.add(mallTenantId); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| @@ -448,6 +455,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| merchantIdList.add(b.getMerchantId()); | merchantIdList.add(b.getMerchantId()); | ||||
| } | } | ||||
| } | } | ||||
| mallMerchantIdList.put(mallTenantId, merchantIdList); | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||