From ab73741249e6e17e0b4da46266a95ba3930b8a99 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Thu, 28 Mar 2024 13:39:43 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Fix:=20=EB=B0=94=EB=A1=9C=20=EC=A3=BC?= =?UTF-8?q?=EB=AC=B8=20=EA=B0=80=EA=B2=A9=20=ED=95=A0=EC=9D=B8=20=EA=B0=80?= =?UTF-8?q?=EA=B2=A9=20=EC=A0=9C=EC=99=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/readyvery/readyverydemo/src/order/dto/OrderMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java index d165554..cfef54c 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java +++ b/src/main/java/com/readyvery/readyverydemo/src/order/dto/OrderMapper.java @@ -291,7 +291,7 @@ private ReceiptHistoryDto orderToReceiptHistoryDto(Order order) { .findFirst() .orElse(null)) .orderName(order.getOrderName()) - .amount(order.getAmount()) + .amount(order.getTotalAmount()) .orderId(order.getOrderId()) .build(); } From 02b5f4e068a5738c2f4fb95f00907b0e8faa6488 Mon Sep 17 00:00:00 2001 From: Joowon Lim Date: Fri, 29 Mar 2024 01:22:56 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Feat:=20=EC=BF=A0=ED=8F=B0=20=EC=9E=94?= =?UTF-8?q?=EC=97=AC=20=EA=B0=AF=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/readyvery/readyverydemo/src/coupon/dto/CouponDto.java | 1 + .../com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponDto.java b/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponDto.java index 06d605d..c3eda73 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponDto.java +++ b/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponDto.java @@ -13,5 +13,6 @@ public class CouponDto { private String publisher; private String description; private Long salePrice; + private Long leftCoupon; private LocalDateTime expirationDate; } diff --git a/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java b/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java index c5a512c..ad1ac60 100644 --- a/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java +++ b/src/main/java/com/readyvery/readyverydemo/src/coupon/dto/CouponMapper.java @@ -27,6 +27,7 @@ private CouponDto toCouponDto(Coupon coupon) { .couponName(coupon.getCouponDetail().getName()) .description(coupon.getCouponDetail().getDescription()) .expirationDate(coupon.getCouponDetail().getExpire()) + .leftCoupon(coupon.getIssueCount() - coupon.getUseCount()) .publisher(coupon.getCouponDetail().getStore() == null ? "레디베리" : coupon.getCouponDetail().getStore().getName()) .salePrice(coupon.getCouponDetail().getSalePrice())