Merge remote-tracking branch 'origin/dev' into refactor/#158-team-notify

Author: munjji

src/main/java/com/jajaja/domain/cart/dto/CartProductResponseDto.java

@@ -35,7 +35,7 @@ public static CartProductResponseDto of(CartProduct cartProduct, boolean isTeamA
 				.optionId(optionId)
 				.optionName(optionName)
 				.quantity(cartProduct.getQuantity())
-				.productThumbnail(product.getImageUrl())
+				.productThumbnail(product.getThumbnailUrl())
 				.unitPrice(price)
 				.totalPrice(cartProduct.getUnitPrice() * cartProduct.getQuantity())
 				.teamAvailable(isTeamAvailable)

src/main/java/com/jajaja/domain/order/entity/Order.java

@@ -104,9 +104,10 @@ public void updateStatus(OrderStatus status) {
         this.orderStatus = status;
     }
 
-    public void updatePaymentInfo(String paymentKey, PaymentMethod paymentMethod, OrderStatus orderStatus, int paidAmount) {
-        this.paymentKey = paymentKey;
+    public void updatePaymentInfo(String orderId, PaymentMethod paymentMethod, String paymentKey,OrderStatus orderStatus, int paidAmount) {
+        this.orderId = orderId;
         this.paymentMethod = paymentMethod;
+        this.paymentKey = paymentKey;
         this.orderStatus = orderStatus;
         this.paidAmount = paidAmount;
         this.paidAt = LocalDateTime.now();

src/main/java/com/jajaja/domain/order/service/OrderCommandServiceImpl.java

@@ -84,7 +84,7 @@ public OrderPrepareResponseDto prepareOrder(Long memberId, OrderPrepareRequestDt
         Coupon coupon = validateCoupon(request.appliedCouponId(), memberId, cartProducts);
        validatePointUsage(request.point(), member);
 
-       int totalAmount = 0;
+       int totalAmount;
        if(request.orderType() == OrderType.PERSONAL) {
            totalAmount = cartProducts.stream()
                    .mapToInt(cp ->
@@ -156,7 +156,7 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
                 .orElseThrow(() -> new BadRequestException(ErrorStatus.ORDER_NOT_FOUND));
 
         // 결제 금액과 결제해야 할 금액이 동일한지 확인
-        if (!request.paidAmount().equals(order.getPaidAmount())) {
+        if (!request.paidAmount().equals(order.getTotalAmount())) {
             throw new GeneralException(ErrorStatus.PAYMENT_AMOUNT_MISMATCH);
         }
 
@@ -170,7 +170,7 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
             HttpEntity<Map<String, Object>> entity = new HttpEntity<>(body, getHeaders());
             ResponseEntity<PaymentResponseDto> responseEntity = restTemplateConfig.restTemplate().postForEntity(tossPaymentsConfig.getApproveUrl(), entity, PaymentResponseDto.class);
             PaymentResponseDto responseDto = getPaymentResponseDto(responseEntity);
-            order.updatePaymentInfo(request.orderId(), PaymentMethod.valueOf(responseDto.type()), OrderStatus.DONE, request.paidAmount());
+            order.updatePaymentInfo(request.orderId(), PaymentMethod.valueOf(responseDto.type()), request.paymentKey(), OrderStatus.DONE, request.paidAmount());
 
             // 포인트 사용
             member.updatePoint(member.getPoint() - order.getPointUsedAmount());
@@ -207,7 +207,7 @@ public OrderApproveResponseDto approveOrder(Long memberId, OrderApproveRequestDt
             return OrderApproveResponseDto.of(order);
 
         } catch (HttpClientErrorException e) { // 400번대 에러
-            log.error("토스 환불 4xx 서버 에러: {}", e.getResponseBodyAsString());
+            log.error("토스 환불 4xx 서버 에러: {}", e.getMessage());
             throw new TossPaymentException(ErrorStatus.TOSS_PAYMENT_BAD_REQUEST);
         } catch (HttpServerErrorException e) { // 500번대 에러
             log.error("토스 환불 5xx 서버 에러: {}", e.getResponseBodyAsString());