diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java index 82c1784a..7c926dd6 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/controller/StorePaymentController.java @@ -34,7 +34,7 @@ public class StorePaymentController { private final StorePaymentService storePaymentService; @PostMapping("/create") - @Operation(summary = "주점 결제 Url 등록 및 생성", description = "새로운 주점 결제 정보를 생성합니다.") + @Operation(summary = "주점 결제 정보 연동 및 생성", description = "새로운 주점 결제 정보를 생성합니다.") @ApiResponse(responseCode = "201", description = "주점 결제 정보 생성 성공") public ResponseEntity createStorePayment(@Valid @RequestBody StorePaymentCreateRequest request, @AuthenticationPrincipal MemberDetails memberDetails) { StorePaymentCreateResponse response = storePaymentService.createStorePayment(request, memberDetails); diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java index 13801ccb..3b6e7f4e 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateRequest.java @@ -15,6 +15,7 @@ public class StorePaymentCreateRequest { private String tossUrl; private String kakaoPayUrl; private String naverPayUrl; + private String accountNumber; public StorePayment toEntity(Long storeId) { return StorePayment.builder() @@ -22,6 +23,7 @@ public StorePayment toEntity(Long storeId) { .tossUrl(tossUrl) .kakaoPayUrl(kakaoPayUrl) .naverPayUrl(naverPayUrl) + .accountNumber(accountNumber) .build(); } } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java index 47bead90..2c2cc785 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentCreateResponse.java @@ -18,15 +18,17 @@ public class StorePaymentCreateResponse { private String tossUrl; private String kakaoPayUrl; private String naverPayUrl; + private String accountNumber; private LocalDateTime createdAt; public static StorePaymentCreateResponse fromEntity(StorePayment storePayment) { return StorePaymentCreateResponse.builder() .paymentMethodId(storePayment.getPaymentMethodId()) .storeId(storePayment.getStoreId()) - .tossUrl(storePayment.getTossUrl()) - .kakaoPayUrl(storePayment.getKakaoPayUrl()) - .naverPayUrl(storePayment.getNaverPayUrl()) + .tossUrl(storePayment.getTossUrl() != null ? storePayment.getTossUrl() : "") + .kakaoPayUrl(storePayment.getKakaoPayUrl() != null ? storePayment.getKakaoPayUrl() : "") + .naverPayUrl(storePayment.getNaverPayUrl() != null ? storePayment.getNaverPayUrl() : "") + .accountNumber(storePayment.getAccountNumber() != null ? storePayment.getAccountNumber() : "") .createdAt(storePayment.getCreatedAt()) .build(); } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java index 04f2e0f6..bbd634e7 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentReadDto.java @@ -17,6 +17,7 @@ public class StorePaymentReadDto { private String tossUrl; private String kakaoPayUrl; private String naverPayUrl; + private String accountNumber; private LocalDateTime createdAt; public static StorePaymentReadDto fromEntity(StorePayment storePayment) { @@ -26,6 +27,7 @@ public static StorePaymentReadDto fromEntity(StorePayment storePayment) { .tossUrl(storePayment.getTossUrl()) .kakaoPayUrl(storePayment.getKakaoPayUrl()) .naverPayUrl(storePayment.getNaverPayUrl()) + .accountNumber(storePayment.getAccountNumber()) .createdAt(storePayment.getCreatedAt()) .build(); } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java index 50320aab..2c2d0220 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/dto/StorePaymentUpdateRequest.java @@ -13,4 +13,5 @@ public class StorePaymentUpdateRequest { private String tossUrl; private String kakaoPayUrl; private String naverPayUrl; + private String accountNumber; } diff --git a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java index ff95015d..67db6c18 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/applicationadmin/storePayment/service/StorePaymentServiceImpl.java @@ -81,7 +81,8 @@ public StorePaymentReadDto updateStorePayment(StorePaymentUpdateRequest request, storePayment.updatePaymentMethodUrl( request.getTossUrl(), request.getKakaoPayUrl(), - request.getNaverPayUrl() + request.getNaverPayUrl(), + request.getAccountNumber() ); storePaymentRepository.save(storePayment); diff --git a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/entity/StorePayment.java b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/entity/StorePayment.java index effb50d8..aebd8b6a 100644 --- a/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/entity/StorePayment.java +++ b/nowait-domain/domain-core-rdb/src/main/java/com/nowait/domaincorerdb/storePayment/entity/StorePayment.java @@ -34,24 +34,30 @@ public class StorePayment extends BaseTimeEntity { @Column(name = "toss_url",length = 500) private String tossUrl; - @Column(name = "kakao_pay_url", length = 500) + @Column(name = "kakao_pay_url", nullable = true, length = 500) private String kakaoPayUrl; - @Column(name = "naver_pay_url", length = 500) + @Column(name = "naver_pay_url", nullable = true, length = 500) private String naverPayUrl; - public StorePayment(LocalDateTime createdAt, Long paymentMethodId, Long storeId, String tossUrl, String kakaoPayUrl, String naverPayUrl) { + @Column(name = "account_number", nullable = true, length = 45) + private String accountNumber; + + public StorePayment(LocalDateTime createdAt, Long paymentMethodId, Long storeId, String tossUrl, String kakaoPayUrl, String naverPayUrl, String accountNumber) { super(createdAt); this.paymentMethodId = paymentMethodId; this.storeId = storeId; this.tossUrl = tossUrl; this.kakaoPayUrl = kakaoPayUrl; this.naverPayUrl = naverPayUrl; + this.accountNumber = accountNumber; } - public void updatePaymentMethodUrl(String tossUrl, String kakaoPayUrl, String naverPayUrl) { + public void updatePaymentMethodUrl(String tossUrl, String kakaoPayUrl, String naverPayUrl, String accountNumber) { if (tossUrl != null) this.tossUrl = tossUrl; if (kakaoPayUrl != null) this.kakaoPayUrl = kakaoPayUrl; if (naverPayUrl != null) this.naverPayUrl = naverPayUrl; + if (accountNumber != null) this.accountNumber = accountNumber; } } +