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 0fb74376a..9f569757e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -274,9 +274,14 @@ public class WxShopServiceImpl implements WxShopService { @Override public Map> findMerchantShopVoList(TenantEntity tenantEntity, List merchantIds) { + Map> retMap = new HashMap>(); Map floorMap = wxMallFloorService.getFloorMap(tenantEntity); Map buildingMap = wxMallBuildingService.getBuildingMap(tenantEntity); List shopIds = wxMerchantShopMapper.findShopIds(merchantIds); + + if(shopIds == null || shopIds.isEmpty()){ + return retMap; + } List shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); Map shopVoMap = new HashMap(); @@ -288,13 +293,13 @@ public class WxShopServiceImpl implements WxShopService { } } - Map> retMap = new HashMap>(); + WxMerchantShop merchantShopQ = new WxMerchantShop(); merchantShopQ.updateTenantInfo(tenantEntity); merchantShopQ.setMerchantIds(merchantIds); List merchantShops = wxMerchantShopMapper.findList(merchantShopQ); if (null == merchantShops) { - return null; + return retMap; } for (int i = 0 ; i < merchantShops.size(); i ++) { WxMerchantShop ms = merchantShops.get(i); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 3d5ed97fa..c67d72c7e 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -176,7 +176,7 @@ - and credit.merchantId in + and credit.merchant_id in #{merchantIdItem}