|
|
|
@@ -1684,7 +1684,7 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<WxMall,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) { |
|
|
|
public Map<String,List<WxMerchantVo>> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) { |
|
|
|
WxCoupon wxCoupon = wxCouponMapper.selectById(couponId,tenantInfo.getTenantId()); |
|
|
|
if (EnumCouponType.isParentCoupon(wxCoupon.getType())){ |
|
|
|
WxCouponMall couponMall = new WxCouponMall(); |
|
|
|
@@ -1693,19 +1693,19 @@ public class WxCouponServiceImpl implements WxCouponService { |
|
|
|
couponMall.setStatus(EnumCouponMallStatus.FINISED.getCode()); |
|
|
|
List<WxCouponMall> couponMallList = wxCouponMallMapper.findList(couponMall); |
|
|
|
if (null != couponMallList && couponMallList.size()> 0 ) { |
|
|
|
Map<WxMall,List<WxMerchantVo>> mallMerchantMap = new HashMap<WxMall,List<WxMerchantVo>>(); |
|
|
|
Map<String,List<WxMerchantVo>> mallMerchantMap = new HashMap<String,List<WxMerchantVo>>(); |
|
|
|
for (int i = 0 ; i < couponMallList.size();i++) { |
|
|
|
WxCouponMall cm = couponMallList.get(i); |
|
|
|
WxMall mall = wxMallMapper.getByTenantId(cm.getMallTenantId()); |
|
|
|
mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall)); |
|
|
|
mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(), getCouponMerchantList(couponId,mall)); |
|
|
|
} |
|
|
|
return mallMerchantMap; |
|
|
|
} |
|
|
|
return null; |
|
|
|
}else { |
|
|
|
Map<WxMall,List<WxMerchantVo>> mallMerchantMap = new HashMap<WxMall,List<WxMerchantVo>>(); |
|
|
|
Map<String,List<WxMerchantVo>> mallMerchantMap = new HashMap<String,List<WxMerchantVo>>(); |
|
|
|
WxMall mall = wxMallMapper.getByTenantId(tenantInfo.getTenantId()); |
|
|
|
mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall)); |
|
|
|
mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(),, getCouponMerchantList(couponId,mall)); |
|
|
|
return mallMerchantMap; |
|
|
|
} |
|
|
|
} |
|
|
|
|