From 337d6bba60e92aa143ad4f75c113b26e5f142c5f Mon Sep 17 00:00:00 2001 From: llprn Date: Mon, 13 Feb 2023 19:05:10 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20DressOrderListDto=20=EC=98=88?= =?UTF-8?q?=EC=95=BDid=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pickle/server/dress/dto/DressOrderDto.java | 2 +- .../com/pickle/server/dress/dto/DressOrderListDto.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java b/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java index de936df..30abd2c 100644 --- a/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java +++ b/src/main/java/com/pickle/server/dress/dto/DressOrderDto.java @@ -76,7 +76,7 @@ public class DressOrderDto { @QueryProjection - public DressOrderDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl/*, DressStock dressStock*/) { + public DressOrderDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl) { DecimalFormat priceFormat = new DecimalFormat("###,###"); this.reservedDressId = reservedDress.getId(); diff --git a/src/main/java/com/pickle/server/dress/dto/DressOrderListDto.java b/src/main/java/com/pickle/server/dress/dto/DressOrderListDto.java index f4cfe05..a140095 100644 --- a/src/main/java/com/pickle/server/dress/dto/DressOrderListDto.java +++ b/src/main/java/com/pickle/server/dress/dto/DressOrderListDto.java @@ -13,9 +13,9 @@ @Getter public class DressOrderListDto { -// @ApiModelProperty(example = "예약내역 id") -// @JsonProperty("reserved_dress_id") -// private Long reservedDressId; + @ApiModelProperty(example = "예약내역 id") + @JsonProperty("reserved_dress_id") + private Long reservedDressId; @ApiModelProperty(example = "yyyy-MM-dd HH:mm:ss") @JsonProperty("pickup_datetime") @@ -45,6 +45,7 @@ public class DressOrderListDto { public DressOrderListDto(DressReservation dressReservation, ReservedDress reservedDress, String dressImageUrl){ DecimalFormat priceFormat = new DecimalFormat("###,###"); + this.reservedDressId = dressReservation.getId(); this.pickUpDateTime = dressReservation.getPickUpDateTime().toString(); this.storeName = dressReservation.getStore().getName(); this.dressName = reservedDress.getDress().getName();