From f3300af9157e96cd7d1ed8943403316e26eb29ce Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 18:15:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?/=E3=80=81.Wxmerchant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2b578d058..3010cf3be 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -961,7 +961,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null != couponId && null != merchantId) { List volist = retMap.get(couponId); if (null == volist) { - volist = new ArrayList(); + volist = new ArrayList<>(); } retMap.put(couponId, volist); WxMerchantVo vo = merchantToVo(cm,merchantMap.get(merchantId),hasShop,merchantShopVoList); From 39fcc2dd6aa146130852b49189b1e273e9becefa Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 18:19:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?/=E3=80=81.Wxshop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxShopServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 620cd4eda..1c5117a9f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -301,7 +301,7 @@ public class WxShopServiceImpl implements WxShopService { if (null != ms.getShopId() && null != ms.getMerchantId()) { List mShopIds = retMap.get(ms.getMerchantId()); if (null == mShopIds) { - mShopIds = new ArrayList(); + mShopIds = new ArrayList<>(); } mShopIds.add(shopVoMap.get(ms.getShopId())); retMap.put(ms.getMerchantId(), mShopIds);