Merge branch 'develop' into feature/#182-feature-customer-order-get-api

Author: hyeonji91

build.gradle

@@ -51,6 +51,17 @@ clean {
     delete querydslDirProperty
 }
 
+//feign client를 위한 springcloud
+ext {
+    set('springCloudVersion', "2025.0.0")
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+}
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
 
@@ -77,6 +88,10 @@ dependencies {
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
 
+    //feign client
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'
+    implementation group: 'io.github.openfeign', name: 'feign-gson', version: '11.0'
+
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/com/irum/come2us/Come2usApplication.java

@@ -2,8 +2,12 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableFeignClients
+@EnableScheduling
 public class Come2usApplication {
 
     public static void main(String[] args) {

src/main/java/com/irum/come2us/domain/coupon/application/service/AppliedCouponService.java

@@ -0,0 +1,43 @@
+package com.irum.come2us.domain.coupon.application.service;
+
+import com.irum.come2us.domain.coupon.domain.entity.AppliedCoupon;
+import com.irum.come2us.domain.coupon.domain.entity.Coupon;
+import com.irum.come2us.domain.coupon.domain.repository.AppliedCouponRepository;
+import com.irum.come2us.domain.coupon.domain.repository.CouponRepository;
+import com.irum.come2us.domain.payment.domain.entity.Payment;
+import java.util.List;
+import java.util.UUID;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class AppliedCouponService {
+    private final AppliedCouponRepository appliedCouponRepository;
+    private final CouponRepository couponRepository;
+
+    /** 쿠폰 사용 처리 */
+    public void createAppliedCouponList(Payment payment, List<UUID> couponIdList) {
+        List<Coupon> couponList = couponRepository.findAllById(couponIdList);
+
+        List<AppliedCoupon> appliedCouponList =
+                couponList.stream()
+                        .map(
+                                coupon ->
+                                        AppliedCoupon.builder()
+                                                .payment(payment)
+                                                .coupon(coupon)
+                                                .build())
+                        .toList();
+
+        appliedCouponRepository.saveAll(appliedCouponList);
+    }
+
+    /** 롤백 */
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
+    public void rollbackAppliedCouponList(Payment payment) {
+        appliedCouponRepository.deleteByPayment(payment);
+    }
+}

src/main/java/com/irum/come2us/domain/coupon/application/service/CouponService.java

@@ -1,13 +1,15 @@
 package com.irum.come2us.domain.coupon.application.service;
 
 import com.irum.come2us.domain.coupon.domain.entity.Coupon;
+import com.irum.come2us.domain.coupon.domain.repository.AppliedCouponRepository;
 import com.irum.come2us.domain.coupon.domain.repository.CouponRepository;
 import com.irum.come2us.domain.coupon.presentation.dto.request.CouponGenerateRequest;
 import com.irum.come2us.domain.member.domain.entity.Member;
 import com.irum.come2us.domain.member.domain.repository.MemberRepository;
 import com.irum.come2us.global.presentation.advice.exception.CommonException;
 import com.irum.come2us.global.presentation.advice.exception.errorcode.CouponErrorCode;
 import com.irum.come2us.global.presentation.advice.exception.errorcode.MemberErrorCode;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -20,6 +22,7 @@
 public class CouponService {
     private final CouponRepository couponRepository;
     private final MemberRepository memberRepository;
+    private final AppliedCouponRepository appliedCouponRepository;
 
     public void createCoupon(CouponGenerateRequest request, Long memberId) {
 
@@ -51,4 +54,36 @@ public void deleteCoupon(UUID couponId, Long memberId) {
         }
         couponRepository.delete(coupon);
     }
+
+    /** 쿠폰 유효성 검증 및 할인 금액 계산 */
+    public int validAndCalCoupon(List<UUID> couponIdList, int calculatedTotalPrice, Member member) {
+        if (couponIdList.isEmpty()) {
+            return 0;
+        }
+
+        int totalDiscount = 0;
+        List<Coupon> couponList = couponRepository.findAllById(couponIdList);
+
+        for (Coupon coupon : couponList) {
+            // 권한 검사
+            if (!coupon.getMember().getMemberId().equals(member.getMemberId())) {
+                throw new CommonException(CouponErrorCode.COUPON_NO_PERMISSION);
+            }
+            // 만료일 검사
+            if (coupon.getExpiration().isBefore(LocalDateTime.now())) {
+                throw new CommonException(CouponErrorCode.COUPON_EXPIRATION);
+            }
+            // 사용 여부 검사
+            if (appliedCouponRepository.existsByCouponId(coupon.getId())) {
+                throw new CommonException(CouponErrorCode.COUPON_ALREADY_USED);
+            }
+            totalDiscount += coupon.getDiscountAmount();
+        }
+
+        if (totalDiscount > calculatedTotalPrice) {
+            totalDiscount = calculatedTotalPrice;
+        }
+
+        return totalDiscount;
+    }
 }

src/main/java/com/irum/come2us/domain/coupon/domain/entity/AppliedCoupon.java

@@ -5,6 +5,8 @@
 import jakarta.persistence.*;
 import java.util.UUID;
 import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.SQLDelete;
@@ -16,6 +18,8 @@
 @Entity
 @Table(name = "p_applied_coupon")
 @Getter
+@Builder
+@AllArgsConstructor
 @SQLDelete(sql = "UPDATE p_applied_coupon SET deleted_at = NOW() WHERE applied_coupon_id = ?")
 @Where(clause = "deleted_at IS NULL")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)

src/main/java/com/irum/come2us/domain/coupon/domain/repository/AppliedCouponRepository.java

@@ -1,10 +1,15 @@
 package com.irum.come2us.domain.coupon.domain.repository;
 
 import com.irum.come2us.domain.coupon.domain.entity.AppliedCoupon;
+import com.irum.come2us.domain.payment.domain.entity.Payment;
 import java.util.List;
 import java.util.UUID;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AppliedCouponRepository extends JpaRepository<AppliedCoupon, UUID> {
     List<AppliedCoupon> findByCouponId(UUID couponId);
+
+    boolean existsByCouponId(UUID couponId);
+
+    void deleteByPayment(Payment payment);
 }

src/main/java/com/irum/come2us/domain/order/application/mapper/CustomerOrderMapper.java

@@ -9,6 +9,8 @@
 import com.irum.come2us.domain.order.presentation.dto.response.OrderDetailResponse;
 import com.irum.come2us.domain.refund.domain.entity.Refund;
 import com.irum.come2us.domain.refund.domain.entity.enums.RefundStatus;
+import com.irum.come2us.domain.order.presentation.dto.response.AddressResponse;
+import com.irum.come2us.domain.order.presentation.dto.response.CustomerOrderResponse;
 import java.util.List;
 import org.springframework.stereotype.Component;
 
@@ -56,6 +58,32 @@ private static OrderDetailResponse.ProductResponse toProductResponse(OrderDetail
                 .build();
     }
 
+    public static CustomerOrderResponse toCustomerOrderResponse(
+            Order order, List<OrderDetail> orderDetailList) {
+        List<CustomerOrderResponse.ProductSummary> productSummaryList =
+                orderDetailList.stream().map(CustomerOrderMapper::toProductSummary).toList();
+
+        return CustomerOrderResponse.builder()
+                .orderId(order.getOrderId())
+                .address(AddressResponse.from(order.getDeliveryAddress().getAddress()))
+                .totalProductPrice(order.getTotalPrice())
+                .totalDiscountAmount(order.getPayment().getTotalDiscountAmount())
+                .totalPaymentAmount(order.getPayment().getAmount())
+                .productList(productSummaryList)
+                .build();
+    }
+
+    private static CustomerOrderResponse.ProductSummary toProductSummary(OrderDetail orderDetail) {
+        return CustomerOrderResponse.ProductSummary.builder()
+                .orderDetailId(orderDetail.getOrderDetailId())
+                .productName(orderDetail.getProductName())
+                .optionName(orderDetail.getOptionName())
+                .price(orderDetail.getPrice())
+                .quantity(orderDetail.getQuantity())
+                .build();
+    }
+
+
     public static CustomerOrderListResponse.OrderResponse toOrderResponse(
             CustomerOrderSummaryRow or, List<CustomerOrderListResponse.ProductResponse> pList) {