diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java b/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java index 2379bfa62..947942ace 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumSaleType.java @@ -12,8 +12,8 @@ public enum EnumSaleType { WX_ENJOY(3,"速享版"), WX_ENJOY_TRY(4, "速享试用版"), TT_ALL_ROUND(11, "抖音尊享版"), - GROUP(100, "集团版"), - GROUP_v1(101, "集团版"), + GROUP(100, "集团版(旧版,每个商场一个小程序)"), + GROUP_v1(101, "集团版(同一个小程序)"), WX_JM_ALL_ROUND(1035001036,"金茂全能版"), ; 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 66df36d18..dbf104325 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -523,6 +523,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponMerchantVoMap = mallCouponMerchantVoMap.get(couponOrder.getBTenantId()); } } + if (null == couponMerchantVoMap) { + couponMerchantVoMap = new HashMap>(); + } WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap,hasMerchant,couponMerchantVoMap); if (null != bvo ) { retList.add(bvo);