Develop

build.gradle

@@ -64,6 +64,10 @@ dependencies {
     implementation 'com.sun.xml.ws:jaxws-rt:2.3.1'
     implementation 'org.glassfish.metro:webservices-rt:2.4.4'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    // excel
+    implementation 'org.apache.poi:poi:5.2.3'       // .xls
+    implementation 'org.apache.poi:poi-ooxml:5.2.3' // .xlsx
 }
 
 tasks.named('test') {

src/main/java/com/jangburich/domain/store/controller/StoreController.java

@@ -1,11 +1,16 @@
 package com.jangburich.domain.store.controller;
 
-import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
@@ -27,6 +32,7 @@
 import com.jangburich.domain.store.dto.response.OrdersTodayResponse;
 import com.jangburich.domain.store.dto.response.PaymentGroupDetailResponse;
 import com.jangburich.domain.store.dto.response.SearchStoresResponse;
+import com.jangburich.domain.store.dto.response.StoreSearchDetailsResponse;
 import com.jangburich.domain.store.dto.response.StoreTeamResponse;
 import com.jangburich.domain.store.service.StoreService;
 import com.jangburich.global.payload.Message;
@@ -44,108 +50,130 @@
 @RequestMapping("/store")
 public class StoreController {
 
-    private final StoreService storeService;
-
-    @Operation(summary = "카테고리 별 가게 목록 조회", description = "카테고리 별로 가게 목록을 조회합니다.")
-    @PostMapping("/category")
-    public ResponseCustom<Page<SearchStoresResponse>> searchByCategory(
-            Authentication authentication,
-            @RequestParam(required = false, defaultValue = "3") Integer searchRadius,
-            @RequestParam(required = false, defaultValue = "ALL") Category category,
-            Double lat,
-            Double lon, Pageable pageable) {
-        return ResponseCustom.OK(
-                storeService.searchByCategory(AuthenticationParser.parseUserId(authentication), searchRadius, category, lat, lon,
-                        pageable));
-    }
-
-    @Operation(summary = "매장 찾기(검색)", description = "검색어와 매장 유형에 맞는 매장을 검색합니다.")
-    @GetMapping("/search")
-    public ResponseCustom<Page<SearchStoresResponse>> searchStores(
-            Authentication authentication,
-            @RequestParam(required = false, defaultValue = "") String keyword, Pageable pageable) {
-        return ResponseCustom.OK(
-                storeService.searchStores(AuthenticationParser.parseUserId(authentication), keyword, pageable));
-    }
-
-    @Operation(summary = "매장 상세 페이지 조회", description = "매장을 상세 조회합니다.")
-    @GetMapping("/{storeId}")
-    public ResponseCustom<StoreSearchDetailsResponse> storeSearchDetails(
-            Authentication authentication,
-            @PathVariable Long storeId
-    ) {
-        return ResponseCustom.OK(storeService.storeSearchDetails(AuthenticationParser.parseUserId(authentication), storeId));
-    }
-
-    @Operation(summary = "가게 등록", description = "신규 파트너 가게를 등록합니다.")
-    @PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public ResponseCustom<Message> createStore(
-            Authentication authentication,
-            @Parameter(name = "image", description = "업로드 사진 데이터") @RequestPart(value = "image") MultipartFile image,
-            @RequestPart(value = "store") StoreCreateRequestDTO storeCreateRequestDTO,
-            @RequestPart(value = "menuImages", required = false) List<MultipartFile> menuImages) {
-
-        storeService.createStore(AuthenticationParser.parseUserId(authentication), storeCreateRequestDTO, image,
-                menuImages);
-        return ResponseCustom.OK(Message.builder().message("success").build());
-    }
-
-
-    @Operation(summary = "가게 정보 수정", description = "가게 정보를 수정합니다.")
-    @PatchMapping("/update")
-    public ResponseCustom<Message> updateStore(Authentication authentication,
-                                               @RequestBody StoreUpdateRequestDTO storeUpdateRequestDTO) {
-        storeService.updateStore(AuthenticationParser.parseUserId(authentication), storeUpdateRequestDTO);
-        return ResponseCustom.OK(Message.builder().message("success").build());
-    }
-
-    @Operation(summary = "가게 정보 조회", description = "가게 상세 정보를 조회합니다.")
-    @GetMapping("")
-    public ResponseCustom<StoreGetResponseDTO> getStoreInfo(Authentication authentication) {
-        return ResponseCustom.OK(storeService.getStoreInfo(AuthenticationParser.parseUserId(authentication)));
-    }
-
-    @Operation(summary = "결제 그룹 조회", description = "장부 결제 그룹을 조회합니다.")
-    @GetMapping("/payment_group")
-    public ResponseCustom<List<StoreTeamResponse>> getPaymentGroup(Authentication authentication) {
-        return ResponseCustom.OK(
-                storeService.getPaymentGroup(AuthenticationParser.parseUserId(authentication)));
-    }
-
-    @Operation(summary = "결제 그룹 상세 조회", description = "장부 결제 그룹을 상세 조회합니다.")
-    @GetMapping("/payment_group/{teamId}")
-    public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(Authentication authentication,
-                                                                            @PathVariable Long teamId) {
-        return ResponseCustom.OK(
-                storeService.getPaymentGroupDetail(AuthenticationParser.parseUserId(authentication), teamId));
-    }
-
-    @Operation(summary = "결제 내역 조회", description = "가게에서 일어난 결제 내역을 조회합니다.")
-    @GetMapping("/payment_history")
-    public ResponseCustom<?> getPaymentHistory(Authentication authentication) {
-        return ResponseCustom.OK(
-                storeService.getPaymentHistory(AuthenticationParser.parseUserId(authentication)));
-    }
-
-    @Operation(summary = "지난 주문 조회", description = "가게에 있는 지난 주문을 조회합니다")
-    @GetMapping("/orders/last")
-    public ResponseCustom<List<OrdersGetResponse>> getLastOrders(Authentication authentication) {
-        List<OrdersGetResponse> ordersLast = storeService.getOrdersLast(
-                AuthenticationParser.parseUserId(authentication));
-        return ResponseCustom.OK(ordersLast);
-    }
-
-    @Operation(summary = "오늘 주문 조회", description = "가게에 있는 오늘 주문을 조회합니다")
-    @GetMapping("/orders/today")
-    public ResponseCustom<OrdersTodayResponse> getTodayOrders(Authentication authentication) {
-        return ResponseCustom.OK(storeService.getTodayOrders(
-                AuthenticationParser.parseUserId(authentication)));
-    }
-
-    @Operation(summary = "주문 상세 조회", description = "가게에 있는 주문을 상세 조회합니다")
-    @GetMapping("/orders/{ordersId}")
-    public ResponseCustom<OrdersDetailResponse> getOrders(Authentication authentication, @RequestParam Long orderId) {
-        return ResponseCustom.OK(
-                storeService.getOrderDetails(AuthenticationParser.parseUserId(authentication), orderId));
-    }
+	private final StoreService storeService;
+
+	@Operation(summary = "카테고리 별 가게 목록 조회", description = "카테고리 별로 가게 목록을 조회합니다.")
+	@PostMapping("/category")
+	public ResponseCustom<Page<SearchStoresResponse>> searchByCategory(
+		Authentication authentication,
+		@RequestParam(required = false, defaultValue = "3") Integer searchRadius,
+		@RequestParam(required = false, defaultValue = "ALL") Category category,
+		Double lat,
+		Double lon, Pageable pageable) {
+		return ResponseCustom.OK(
+			storeService.searchByCategory(AuthenticationParser.parseUserId(authentication), searchRadius, category, lat,
+				lon,
+				pageable));
+	}
+
+	@Operation(summary = "매장 찾기(검색)", description = "검색어와 매장 유형에 맞는 매장을 검색합니다.")
+	@GetMapping("/search")
+	public ResponseCustom<Page<SearchStoresResponse>> searchStores(
+		Authentication authentication,
+		@RequestParam(required = false, defaultValue = "") String keyword, Pageable pageable) {
+		return ResponseCustom.OK(
+			storeService.searchStores(AuthenticationParser.parseUserId(authentication), keyword, pageable));
+	}
+
+	@Operation(summary = "매장 상세 페이지 조회", description = "매장을 상세 조회합니다.")
+	@GetMapping("/{storeId}")
+	public ResponseCustom<StoreSearchDetailsResponse> storeSearchDetails(
+		Authentication authentication,
+		@PathVariable Long storeId
+	) {
+		return ResponseCustom.OK(
+			storeService.storeSearchDetails(AuthenticationParser.parseUserId(authentication), storeId));
+	}
+
+	@Operation(summary = "가게 등록", description = "신규 파트너 가게를 등록합니다.")
+	@PostMapping(value = "/create", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+	public ResponseCustom<Message> createStore(
+		Authentication authentication,
+		@Parameter(name = "image", description = "업로드 사진 데이터") @RequestPart(value = "image") MultipartFile image,
+		@RequestPart(value = "store") StoreCreateRequestDTO storeCreateRequestDTO,
+		@RequestPart(value = "menuImages", required = false) List<MultipartFile> menuImages) {
+
+		storeService.createStore(AuthenticationParser.parseUserId(authentication), storeCreateRequestDTO, image,
+			menuImages);
+		return ResponseCustom.OK(Message.builder().message("success").build());
+	}
+
+	@Operation(summary = "가게 정보 수정", description = "가게 정보를 수정합니다.")
+	@PatchMapping("/update")
+	public ResponseCustom<Message> updateStore(Authentication authentication,
+		@RequestBody StoreUpdateRequestDTO storeUpdateRequestDTO) {
+		storeService.updateStore(AuthenticationParser.parseUserId(authentication), storeUpdateRequestDTO);
+		return ResponseCustom.OK(Message.builder().message("success").build());
+	}
+
+	@Operation(summary = "가게 정보 조회", description = "가게 상세 정보를 조회합니다.")
+	@GetMapping("")
+	public ResponseCustom<StoreGetResponseDTO> getStoreInfo(Authentication authentication) {
+		return ResponseCustom.OK(storeService.getStoreInfo(AuthenticationParser.parseUserId(authentication)));
+	}
+
+	@Operation(summary = "결제 그룹 조회", description = "장부 결제 그룹을 조회합니다.")
+	@GetMapping("/payment_group")
+	public ResponseCustom<List<StoreTeamResponse>> getPaymentGroup(Authentication authentication) {
+		return ResponseCustom.OK(
+			storeService.getPaymentGroup(AuthenticationParser.parseUserId(authentication)));
+	}
+
+	@Operation(summary = "결제 그룹 상세 조회", description = "장부 결제 그룹을 상세 조회합니다.")
+	@GetMapping("/payment_group/{teamId}")
+	public ResponseCustom<PaymentGroupDetailResponse> getPaymentGroupDetail(Authentication authentication,
+		@PathVariable Long teamId) {
+		return ResponseCustom.OK(
+			storeService.getPaymentGroupDetail(AuthenticationParser.parseUserId(authentication), teamId));
+	}
+
+	@Operation(summary = "결제 내역 조회", description = "가게에서 일어난 결제 내역을 조회합니다.")
+	@GetMapping("/payment_history")
+	public ResponseCustom<?> getPaymentHistory(Authentication authentication) {
+		return ResponseCustom.OK(
+			storeService.getPaymentHistory(AuthenticationParser.parseUserId(authentication)));
+	}
+
+	@Operation(summary = "지난 주문 조회", description = "가게에 있는 지난 주문을 조회합니다")
+	@GetMapping("/orders/last")
+	public ResponseCustom<List<OrdersGetResponse>> getLastOrders(Authentication authentication) {
+		List<OrdersGetResponse> ordersLast = storeService.getOrdersLast(
+			AuthenticationParser.parseUserId(authentication));
+		return ResponseCustom.OK(ordersLast);
+	}
+
+	@Operation(summary = "오늘 주문 조회", description = "가게에 있는 오늘 주문을 조회합니다")
+	@GetMapping("/orders/today")
+	public ResponseCustom<OrdersTodayResponse> getTodayOrders(Authentication authentication) {
+		return ResponseCustom.OK(storeService.getTodayOrders(
+			AuthenticationParser.parseUserId(authentication)));
+	}
+
+	@Operation(summary = "주문 상세 조회", description = "가게에 있는 주문을 상세 조회합니다")
+	@GetMapping("/orders/{ordersId}")
+	public ResponseCustom<OrdersDetailResponse> getOrders(Authentication authentication, @RequestParam Long orderId) {
+		return ResponseCustom.OK(
+			storeService.getOrderDetails(AuthenticationParser.parseUserId(authentication), orderId));
+	}
+
+	@Operation(summary = "가게 엑셀 다운로드", description = "가게 장부 세부 내역을 엑셀로 제공합니다.")
+	@GetMapping("/excel")
+	public ResponseEntity<?> getExcel(
+		// Authentication authentication,
+		@RequestParam(defaultValue = "1") Integer period
+	) {
+		byte[] excel = storeService.createExcel("test-owner", period);
+
+		String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+		String fileName = "장부_세부내역_" + period + "개월_" + today + ".xlsx";
+		String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8)
+			.replace("+", "%20");
+
+		HttpHeaders headers = new HttpHeaders();
+		headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
+		headers.set("Content-Disposition",
+			"attachment; filename=\"" + encodedFileName + "\"; filename*=UTF-8''" + encodedFileName);
+
+		return ResponseEntity.ok().headers(headers).body(excel);
+	}
 }

src/main/java/com/jangburich/domain/store/domain/StoreChargeHistoryResponse.java

@@ -1,21 +1,26 @@
 package com.jangburich.domain.store.domain;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
+import com.jangburich.domain.point.domain.TransactionType;
 import com.querydsl.core.annotations.QueryProjection;
 
 public record StoreChargeHistoryResponse(
 	Long id,
 	LocalDateTime createdAt,
 	String teamName,
-	Integer transactionedPoint
+	Long teamId,
+	Integer transactionedPoint,
+	TransactionType transactionType
 ) {
 	@QueryProjection
-	public StoreChargeHistoryResponse(Long id, LocalDateTime createdAt, String teamName, Integer transactionedPoint) {
+	public StoreChargeHistoryResponse(Long id, LocalDateTime createdAt, String teamName, Long teamId,
+		Integer transactionedPoint, TransactionType transactionType) {
 		this.id = id;
 		this.createdAt = createdAt;
 		this.teamName = teamName;
+		this.teamId = teamId;
 		this.transactionedPoint = transactionedPoint;
+		this.transactionType = transactionType;
 	}
 }

src/main/java/com/jangburich/domain/store/domain/StoreTeam.java

@@ -48,6 +48,9 @@ public class StoreTeam extends BaseEntity {
 	@Column(name = "prepaid_expiration_date")
 	private LocalDate prepaidExpirationDate;
 
+	@Column(name = "prepay_count")
+	private Integer prepayCount;
+
 	public void updatePersonalAllocatedPoint(Integer point) {
 		this.personalAllocatedPoint = point;
 	}

src/main/java/com/jangburich/domain/store/domain/StoreTeamResponseDTO.java

@@ -10,6 +10,7 @@
 public record StoreTeamResponseDTO(
 		Long id,
 		Integer remainPoint,
+		Integer point,
 		Long teamId,
 		String teamName,
 		String teamDescription,
@@ -18,10 +19,11 @@ public record StoreTeamResponseDTO(
 
 ) {
 	@QueryProjection
-	public StoreTeamResponseDTO(Long id, Integer remainPoint, Long teamId, String teamName, String teamDescription,
-								Long storeId, LocalDateTime updatedAt) {
+	public StoreTeamResponseDTO(Long id, Integer remainPoint, Integer point, Long teamId, String teamName,
+		String teamDescription, Long storeId, LocalDateTime updatedAt) {
 		this.id = id;
 		this.remainPoint = remainPoint;
+		this.point = point;
 		this.teamId = teamId;
 		this.teamName = teamName;
 		this.teamDescription = teamDescription;

src/main/java/com/jangburich/domain/store/service/PrepayService.java

@@ -69,6 +69,7 @@ public Message prepay(String userId, PrepayRequest prepayRequest) {
 			.transactionedPoint(prepayRequest.prepayAmount())
 			.user(user)
 			.store(store)
+			.team(team)
 			.build();
 
 		pointTransactionRepository.save(pointTransaction);
@@ -94,6 +95,7 @@ public Message prepay(String userId, PrepayRequest prepayRequest) {
 		StoreTeam storeTeam = storeAndTeam.get();
 		storeTeam.setPersonalAllocatedPoint(prepayRequest.personalAllocatedAmount());
 		storeTeam.recharge(prepayRequest.prepayAmount());
+		storeTeam.setPrepayCount(storeTeam.getPrepayCount() + 1);
 
 		return Message.builder()
 			.message("매장 선결제가 완료되었습니다.")