Skip to content

πŸ”¨ Fix - νšŒμ› μ£Όλ¬Έ 상세 API 에 쿠폰 μœ νš¨κΈ°κ°„, description ν•„λ“œ μΆ”κ°€ #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dongkyeomjang merged 2 commits into from
Aug 19, 2025
Merged

πŸ”¨ Fix - νšŒμ› μ£Όλ¬Έ 상세 API 에 쿠폰 μœ νš¨κΈ°κ°„, description ν•„λ“œ μΆ”κ°€ #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbcf695
Fix/#788: νšŒμ› μ£Όλ¬Έ 상세 API 에 쿠폰 μœ νš¨κΈ°κ°„, description ν•„λ“œ μΆ”κ°€
dongkyeomjang Aug 19, 2025
6a7cc85
Fix/#788: document 사이에 곡백 μΆ”κ°€
dongkyeomjang Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/tookscan/tookscan/order/domain/Order.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
63 changes: 63 additions & 0 deletions ...com/tookscan/tookscan/order/presentation/dto/response/ReadUserOrderDetailResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -237,6 +247,9 @@ public ReadUserOrderDetailResponseDto(
ECouponType couponType,
Integer couponPrice,
Integer couponPercentage,
String couponDescription,
String couponStartDate,
String couponEndDate,
Integer paymentTotal,
String receiptUrl,
String couponName,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down