Skip to content

Commit

Permalink
Merge pull request #240 from readyvery/test
Browse files Browse the repository at this point in the history
Fix: 쿠폰 관련 수정
  • Loading branch information
marinesnow34 authored Apr 2, 2024
2 parents 7a7b35a + 30a440d commit 2af577d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ public class CouponDto {
private String publisher;
private String description;
private Long salePrice;
private Long leftCoupon;
private LocalDateTime expirationDate;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down

0 comments on commit 2af577d

Please sign in to comment.