Merge branch 'main' of https://github.com/Donut-DONationUTile/Donut_S…

…erver into feature/donation
Donut-DONationUTile · Feb 22, 2024 · 91ab74e · 91ab74e
2 parents ce19ca9 + 3d4e91e
commit 91ab74e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/main/java/zero/eight/donut/repository/GiftboxRepository.java b/src/main/java/zero/eight/donut/repository/GiftboxRepository.java
@@ -36,4 +36,5 @@ default Map<Store, Integer> getGiftboxSumsByStore(Long receiverId) {
         }
         return storeGiftBoxSums;
     }
+
 }
diff --git a/src/main/java/zero/eight/donut/service/HomeReceiverService.java b/src/main/java/zero/eight/donut/service/HomeReceiverService.java
@@ -37,6 +37,7 @@ public ApiResponse receiverHome(){
             return ApiResponse.failure(Error.NOT_AUTHENTICATED_EXCEPTION);
         }
         Receiver receiver = authUtils.getReceiver();
+        Long receiver_id = receiver.getId();
 
         //사용 가능한 꾸러미만 조회
         List<Giftbox> giftboxList = Optional.ofNullable(giftboxRepository.findAllByReceiverIdAndIsAvailable(receiver.getId()))
@@ -49,12 +50,14 @@ public ApiResponse receiverHome(){
 //        Integer cu = cuGiftBox.orElse(0);
 //        Integer gs25 = gs25GiftBox.orElse(0);
 //        Integer seveneleven = sevenelevenGiftBox.orElse(0);
+
         //사용처별 꾸러미 잔액 -> 쿼리 한번만 호출하도록 변경
         Map<Store, Integer> storeGiftBoxMap = giftboxRepository.getGiftboxSumsByStore(receiver.getId());
         Integer cu = storeGiftBoxMap.getOrDefault(Store.CU, 0);
         Integer gs25 = storeGiftBoxMap.getOrDefault(Store.GS25, 0);
         Integer seveneleven = storeGiftBoxMap.getOrDefault(Store.SEVENELEVEN, 0);
 
+
         //꾸러미 정보 가져오기
         List<BoxInfo> boxInfoList = new ArrayList<>();
         Long amount = 0L;
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             return storeGiftBoxSums;
         }
     }