From fbcf6958b135f57515621517120e2d4f8deddfc2 Mon Sep 17 00:00:00 2001
From: dongkyeomjang <jangelliot0404@dgu.ac.kr>
Date: Tue, 19 Aug 2025 22:05:00 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Fix/#788:=20=ED=9A=8C=EC=9B=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=20=EC=83=81=EC=84=B8=20API=20=EC=97=90=20=EC=BF=A0?=
 =?UTF-8?q?=ED=8F=B0=20=EC=9C=A0=ED=9A=A8=EA=B8=B0=EA=B0=84,=20description?=
 =?UTF-8?q?=20=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadUserOrderDetailResponseDto.java       | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/src/main/java/com/tookscan/tookscan/order/presentation/dto/response/ReadUserOrderDetailResponseDto.java b/src/main/java/com/tookscan/tookscan/order/presentation/dto/response/ReadUserOrderDetailResponseDto.java
index 80d810a5..42f10133 100644
--- a/src/main/java/com/tookscan/tookscan/order/presentation/dto/response/ReadUserOrderDetailResponseDto.java
+++ b/src/main/java/com/tookscan/tookscan/order/presentation/dto/response/ReadUserOrderDetailResponseDto.java
@@ -4,6 +4,7 @@
 import com.tookscan.tookscan.address.dto.response.AddressResponseDto;
 import com.tookscan.tookscan.core.dto.SelfValidating;
 import com.tookscan.tookscan.core.utility.DateTimeUtil;
+import com.tookscan.tookscan.order.domain.CouponTemplate;
 import com.tookscan.tookscan.order.domain.Document;
 import com.tookscan.tookscan.order.domain.Order;
 import com.tookscan.tookscan.order.domain.type.ECouponType;
@@ -104,6 +105,15 @@ public class ReadUserOrderDetailResponseDto extends SelfValidating<ReadUserOrder
     @JsonProperty("coupon_percentage")
     private final Integer couponPercentage;
 
+    @JsonProperty("coupon_description")
+    private final String couponDescription;
+
+    @JsonProperty("coupon_start_date")
+    private final String couponStartDate;
+
+    @JsonProperty("coupon_end_date")
+    private final String couponEndDate;
+
     @JsonProperty("payment_total")
     private final Integer paymentTotal;
 
@@ -237,6 +247,9 @@ public ReadUserOrderDetailResponseDto(
             ECouponType couponType,
             Integer couponPrice,
             Integer couponPercentage,
+            String couponDescription,
+            String couponStartDate,
+            String couponEndDate,
             Integer paymentTotal,
             String receiptUrl,
             String couponName,
@@ -269,6 +282,9 @@ public ReadUserOrderDetailResponseDto(
         this.couponType = couponType;
         this.couponPrice = couponPrice;
         this.couponPercentage = couponPercentage;
+        this.couponDescription = couponDescription;
+        this.couponStartDate = couponStartDate;
+        this.couponEndDate = couponEndDate;
         this.paymentTotal = paymentTotal;
         this.receiptUrl = receiptUrl;
         this.couponName = couponName;
@@ -316,6 +332,46 @@ public static ReadUserOrderDetailResponseDto of(Order order, UUID customerKey) {
                 ? order.getUsedCoupon().getIssuedCoupon().getCouponTemplate().getName()
                 : null;
 
+        String description = null;
+        if (order.getUsedCoupon() != null) {
+            CouponTemplate couponTemplate = order.getUsedCoupon().getIssuedCoupon().getCouponTemplate();
+
+            if (couponTemplate.getType().equals(ECouponType.PERCENTAGE)) {
+                int percent = couponTemplate.getDiscountPercent();
+                Integer minPrice = couponTemplate.getMinOrderPrice();
+                Integer maxPrice = couponTemplate.getMaxDiscountPrice();
+
+                if (minPrice != null && maxPrice != null) {
+                    description = String.format("%d%% 할인 (%d원 이상 / 최대 %d원)", percent, minPrice, maxPrice);
+                } else if (maxPrice != null) {
+                    description = String.format("%d%% 할인 (최대 %d원)", percent, maxPrice);
+                } else if (minPrice != null) {
+                    description = String.format("%d%% 할인 (%d원 이상)", percent, minPrice);
+                } else {
+                    description = String.format("%d%% 할인", percent);
+                }
+
+            } else if (couponTemplate.getType().equals(ECouponType.AMOUNT)) {
+                int amount = couponTemplate.getDiscountPrice();
+                Integer minPrice = couponTemplate.getMinOrderPrice();
+                Integer maxPrice = couponTemplate.getMaxDiscountPrice();
+
+                if (minPrice != null && maxPrice != null) {
+                    description = String.format("%d원 할인 (%d원 이상 / 최대 %d원)", amount, minPrice, maxPrice);
+                } else if (maxPrice != null) {
+                    description = String.format("%d원 할인 (최대 %d원)", amount, maxPrice);
+                } else if (minPrice != null) {
+                    description = String.format("%d원 할인 (%d원 이상)", amount, minPrice);
+                } else {
+                    description = String.format("%d원 할인", amount);
+                }
+            } else if (couponTemplate.getType().equals(ECouponType.OCR_FREE)) {
+                description = ECouponType.OCR_FREE.getDescription();
+            } else if (couponTemplate.getType().equals(ECouponType.DELIVERY_PRICE_FREE)) {
+                description = ECouponType.DELIVERY_PRICE_FREE.getDescription();
+            }
+        }
+
         return ReadUserOrderDetailResponseDto.builder()
                 .id(order.getId().toString())
                 .orderNumber(order.getOrderNumber())
@@ -349,6 +405,13 @@ public static ReadUserOrderDetailResponseDto of(Order order, UUID customerKey) {
                 .cuttingPrice(cuttingPriceSum)
                 .ocrPrice(ocrPriceSum)
                 .couponPrice(order.getUsedCoupon() != null ? order.getUsedCoupon().getIssuedCoupon().getDiscountPrice(order.getDocumentsTotalAmount(), ocrPriceSum, order.getDelivery().getDeliveryPrice()) : null)
+                .couponDescription(description)
+                .couponStartDate(order.getUsedCoupon() != null && order.getUsedCoupon().getIssuedCoupon().getCouponTemplate().getStartDateTime() != null
+                        ? DateTimeUtil.convertLocalDateToDartString(order.getUsedCoupon().getIssuedCoupon().getCouponTemplate().getStartDateTime().toLocalDate())
+                        : null)
+                .couponEndDate(order.getUsedCoupon() != null && order.getUsedCoupon().getIssuedCoupon().getCouponTemplate().getEndDateTime() != null
+                        ? DateTimeUtil.convertLocalDateToDartString(order.getUsedCoupon().getIssuedCoupon().getCouponTemplate().getEndDateTime().toLocalDate())
+                        : null)
                 .paymentTotal(paymentOpt.map(Payment::getTotalAmount).orElse(order.getTotalAmount()))
                 .receiptUrl(paymentOpt.map(Payment::getReceiptUrl).orElse(null))
                 .customerKey(customerKey)

From 6a7cc854bfec4121f6935bc26d64ec2c9f745ccd Mon Sep 17 00:00:00 2001
From: dongkyeomjang <jangelliot0404@dgu.ac.kr>
Date: Tue, 19 Aug 2025 22:05:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Fix/#788:=20document=20=EC=82=AC=EC=9D=B4?=
 =?UTF-8?q?=EC=97=90=20=EA=B3=B5=EB=B0=B1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/tookscan/tookscan/order/domain/Order.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/tookscan/tookscan/order/domain/Order.java b/src/main/java/com/tookscan/tookscan/order/domain/Order.java
index 4f466305..b298d2ad 100644
--- a/src/main/java/com/tookscan/tookscan/order/domain/Order.java
+++ b/src/main/java/com/tookscan/tookscan/order/domain/Order.java
@@ -342,7 +342,7 @@ public String getPdfPresignedUrls() {
                     content += "</ul></li>";
                     return content;
                 })
-                .reduce((doc1, doc2) -> doc1 + "<br /> <br />" + doc2)
+                .reduce((doc1, doc2) -> doc1 + "<br />" + doc2)
                 .orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_DOCUMENT));
     }