diff --git a/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java index c5a2a338..b6cd3e48 100644 --- a/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java +++ b/src/main/java/com/interplug/qcast/biz/login/dto/UserResponse.java @@ -24,5 +24,5 @@ public class UserResponse { private String pwdInitYn; // Password Init Yn private String storeLvl; // Store Level private String groupId; // groupId - + private String custCd; // custCd } diff --git a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java index 36fecf6b..506e8d8e 100644 --- a/src/main/java/com/interplug/qcast/biz/object/ObjectService.java +++ b/src/main/java/com/interplug/qcast/biz/object/ObjectService.java @@ -84,41 +84,43 @@ public class ObjectService { if ("T01".equals(saleStoreId)) { storeList = objectMapper.selectSaleStoreAllList(); - } else { - storeList = objectMapper.selectSaleStoreList(saleStoreId); - } - // [1]. 판매점 목록 조회 결과 - if (storeList.size() > 0) { - StoreFavoriteRequest storeFavoriteReq = new StoreFavoriteRequest(); - storeFavoriteReq.setUserId(userId); + // [1]. 판매점 목록 조회 결과 + if (storeList.size() > 0) { + StoreFavoriteRequest storeFavoriteReq = new StoreFavoriteRequest(); + storeFavoriteReq.setUserId(userId); - // [2]. 사용자 판매점 즐겨찾기 목록 조회 (QSP -> QCAST) - StoreFavoriteResponse storeFavoriteRes = new StoreFavoriteResponse(); - storeFavoriteRes = storeFavoriteService.getStoreFavoriteList(storeFavoriteReq); + // [2]. 사용자 판매점 즐겨찾기 목록 조회 (QSP -> QCAST) + StoreFavoriteResponse storeFavoriteRes = new StoreFavoriteResponse(); + storeFavoriteRes = storeFavoriteService.getStoreFavoriteList(storeFavoriteReq); - List> data = (List>) storeFavoriteRes.getData(); - Map result = (Map) storeFavoriteRes.getResult(); + List> data = (List>) storeFavoriteRes.getData(); + Map result = (Map) storeFavoriteRes.getResult(); - // [3]. 판매점 목록 중, 즐겨찾기 판매점에 해당하는 경우 정렬 기준 셋팅 - if ("S".equals(result.get("resultCode"))) { - if (data.size() > 0) { - for (SaleStoreResponse saleStore : storeList) { - String storeId = saleStore.getSaleStoreId(); - saleStore.setPriority("B"); - for (Map storeFavorite : data) { - String favStoreId = (String) storeFavorite.get("storeId"); - if (storeId.equals(favStoreId)) { - saleStore.setPriority("A" + (String) storeFavorite.get("priority")); + // [3]. 판매점 목록 중, 즐겨찾기 판매점에 해당하는 경우 정렬 기준 셋팅 + if ("S".equals(result.get("resultCode"))) { + if (data.size() > 0) { + for (SaleStoreResponse saleStore : storeList) { + String storeId = saleStore.getSaleStoreId(); + saleStore.setPriority("B"); + for (Map storeFavorite : data) { + String favStoreId = (String) storeFavorite.get("storeId"); + if (storeId.equals(favStoreId)) { + saleStore.setPriority("A" + (String) storeFavorite.get("priority")); + } } } + // [4]. 정렬 기준 sort (오름차순) + storeList.sort(Comparator.comparing(SaleStoreResponse::getPriority)); } - // [4]. 정렬 기준 sort (오름차순) - storeList.sort(Comparator.comparing(SaleStoreResponse::getPriority)); + } else { + throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR, + (String) result.get("resultMsg")); } - } else { - throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR, (String) result.get("resultMsg")); } + + } else { + storeList = objectMapper.selectSaleStoreList(saleStoreId); } return storeList;