From ed9b716e1514fe8172f7ab69ce816643f25239a2 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Mon, 12 Dec 2022 17:14:30 +0800 Subject: [PATCH] fix bug --- .../service/impl/WxCouponOrderServiceImpl.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index b61155896..ea7a63185 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -392,6 +392,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List cUserIdList = new ArrayList(); List couponIdList = new ArrayList(); List mallTenantIdList = new ArrayList(); + mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); + //查询子广场 + WxMall wxMallq = new WxMall(); + wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId()); + List 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 ++) { WxCouponOrder co = couponOrderList.get(j); Long bUserId = co.getBUserId(); @@ -402,13 +412,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null == bUserIdList) { bUserIdList = new ArrayList(); } - if (bUserIdList.contains(bUserId)) { + if (!bUserIdList.contains(bUserId)) { bUserIdList.add(bUserId); } mallBUserIdList.put(mallTenantId, bUserIdList); - if (!mallTenantIdList.contains(mallTenantId)) { - mallTenantIdList.add(mallTenantId); - } } } @@ -448,6 +455,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantIdList.add(b.getMerchantId()); } } + mallMerchantIdList.put(mallTenantId, merchantIdList); } } }