diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 9cfcbdb4e..9d689beb9 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -279,7 +279,7 @@ public interface WxCouponService { Map getCouponMap(List couponIds, TenantEntity tenantEntity); - Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId); + Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId); /** * 作废卷 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 2c2a417f8..223b50595 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1684,7 +1684,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Map> getCouponMerchantList(TenantEntity tenantInfo, Long couponId) { + public Map> 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 couponMallList = wxCouponMallMapper.findList(couponMall); if (null != couponMallList && couponMallList.size()> 0 ) { - Map> mallMerchantMap = new HashMap>(); + Map> mallMerchantMap = new HashMap>(); 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> mallMerchantMap = new HashMap>(); + Map> mallMerchantMap = new HashMap>(); WxMall mall = wxMallMapper.getByTenantId(tenantInfo.getTenantId()); - mallMerchantMap.put(mall, getCouponMerchantList(couponId,mall)); + mallMerchantMap.put(mall.getTenantId()+"|"+mall.getName(),, getCouponMerchantList(couponId,mall)); return mallMerchantMap; } }