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()) 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(); }