Skip to content

Commit

Permalink
Merge branch 'develop' into feature/233
Browse files Browse the repository at this point in the history
  • Loading branch information
dldmldlsy committed Jan 26, 2024
2 parents 23606b1 + e4a43f0 commit 1255105
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import site.goldenticket.common.response.CommonResponse;
import site.goldenticket.domain.payment.dto.request.PaymentRequest;
import site.goldenticket.domain.payment.dto.response.PaymentDetailResponse;
import site.goldenticket.domain.payment.dto.response.PaymentReadyResponse;
import site.goldenticket.domain.payment.dto.request.PaymentRequest;
import site.goldenticket.domain.payment.dto.response.PaymentResponse;
import site.goldenticket.domain.payment.service.PaymentService;
import site.goldenticket.domain.security.PrincipalDetails;
Expand Down Expand Up @@ -44,4 +44,18 @@ public ResponseEntity<CommonResponse<PaymentResponse>> savePayment(
PaymentResponse paymentResponse = paymentService.savePayment(request, principalDetails);
return ResponseEntity.ok(CommonResponse.ok("Payment result", paymentResponse));
}

@PostMapping("/mobile/result")
public ResponseEntity<CommonResponse<PaymentResponse>> saveMobliePayment(
@RequestParam(name = "imp_uid") String impUid,
@RequestParam(name = "merchant_uid") Long orderId,
@AuthenticationPrincipal PrincipalDetails principalDetails
) {
PaymentRequest request = PaymentRequest.builder()
.impUid(impUid)
.orderId(orderId)
.build();
PaymentResponse paymentResponse = paymentService.savePayment(request, principalDetails);
return ResponseEntity.ok(CommonResponse.ok("Payment result", paymentResponse));
};
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package site.goldenticket.domain.payment.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;

@Getter
@Builder
public class PaymentRequest {
@NotNull
private String impUid;
Expand Down

0 comments on commit 1255105

Please sign in to comment.