| @@ -132,25 +132,26 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| suq.setShopIds(shopIdList); | suq.setShopIds(shopIdList); | ||||
| suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); | ||||
| Map<Long, WxShopUsers> shopUserMap = this.getShopUserMap(suq); | Map<Long, WxShopUsers> shopUserMap = this.getShopUserMap(suq); | ||||
| if (null != shopUserMap) { | |||||
| for (int i = 0 ; i < page.getList().size(); i ++) { | |||||
| WxShop shop = page.getList().get(i); | |||||
| for (int i = 0 ; i < page.getList().size(); i ++) { | |||||
| WxShop shop = page.getList().get(i); | |||||
| if (null != shopUserMap) { | |||||
| WxShopUsers su = shopUserMap.get(shop.getId()); | WxShopUsers su = shopUserMap.get(shop.getId()); | ||||
| if (null != su) { | if (null != su) { | ||||
| shop.setShopUserType(su.getType()); | shop.setShopUserType(su.getType()); | ||||
| shop.setShopUserTypeName(su.getTypeName()); | shop.setShopUserTypeName(su.getTypeName()); | ||||
| shop.setShopUserName(su.getName()); | shop.setShopUserName(su.getName()); | ||||
| } | } | ||||
| if (null != buildingMap) { | |||||
| String buildingName = buildingMap.get(shop.getBuilding()); | |||||
| shop.setBuildingName(buildingName); | |||||
| } | |||||
| if (null != floorMap) { | |||||
| String floorName = floorMap.get(shop.getFloor()); | |||||
| shop.setFloorName(floorName); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | |||||
| if (null != buildingMap) { | |||||
| String buildingName = buildingMap.get(shop.getBuilding()); | |||||
| shop.setBuildingName(buildingName); | |||||
| } | |||||
| if (null != floorMap) { | |||||
| String floorName = floorMap.get(shop.getFloor()); | |||||
| shop.setFloorName(floorName); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| return page; | return page; | ||||
| } | } | ||||