diff --git a/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailDto.java b/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailDto.java index 596ffc3..12cbe60 100644 --- a/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailDto.java +++ b/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailDto.java @@ -8,13 +8,13 @@ @Getter @NoArgsConstructor public class MyOrderFormDetailDto { - private Long itemId; + private Long item_id; private String name; private Long price; private int count; public MyOrderFormDetailDto(OrderDetail orderDetail){ - this.itemId = orderDetail.getItem().getId(); + this.item_id = orderDetail.getItem().getId(); this.name = orderDetail.getItem().getName(); this.price = orderDetail.getItem().getPrice(); this.count = orderDetail.getCount(); diff --git a/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailResponseDto.java b/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailResponseDto.java index a58cb28..3450733 100644 --- a/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailResponseDto.java +++ b/src/main/java/wowmarket/wow_server/mypage/myorder/dto/MyOrderFormDetailResponseDto.java @@ -13,6 +13,14 @@ @NoArgsConstructor public class MyOrderFormDetailResponseDto { + private Long order_id; + private String project_name; + private String description; + private int total_price; + private String thumbnail; + private int status; + private int is_del; + private List itemList; private String receiver; private String address; @@ -20,43 +28,45 @@ public class MyOrderFormDetailResponseDto { private String zipcode; private String message; private String phone; + private String seller_bank; private String seller_account; private String seller_account_name; - private String buyer_bank; - private String buyer_account; - private String buyer_account_name; - private String deposittime; - private String project_name; - private String description; - private int total_price; - private String thumbnail; - private int status; - private int is_del; - private Long order_id; + + private String deposit_name; + private String deposit_time; + + private String refund_bank; + private String refund_account; + public MyOrderFormDetailResponseDto(List itemList, Orders orders, String address){ + this.order_id = orders.getId(); + this.project_name = orders.getProject().getProjectName(); + this.description = orders.getProject().getDescription(); + this.total_price = orders.getTotal_price(); + this.thumbnail = orders.getProject().getThumbnail(); + this.status = orders.getOrder_status(); + this.is_del = orders.getIsDel(); + this.itemList = itemList; + this.receiver = orders.getReceiver(); this.address = address; this.delivery_fee = orders.getProject().getDelivery_fee(); this.zipcode = orders.getZipcode(); this.message = orders.getDelivery_msg(); this.phone = orders.getPhone(); + this.seller_bank = orders.getProject().getBank(); this.seller_account = orders.getProject().getAccount(); this.seller_account_name = orders.getProject().getAccount_holder_name(); - this.buyer_bank = orders.getBank(); - this.buyer_account = orders.getAccount(); - this.buyer_account_name = orders.getDepositor(); - this.deposittime = orders.getDepositTime(); - this.project_name = orders.getProject().getProjectName(); - this.description = orders.getProject().getDescription(); - this.total_price = orders.getTotal_price(); - this.thumbnail = orders.getProject().getThumbnail(); - this.status = orders.getOrder_status(); - this.is_del = orders.getIsDel(); - this.order_id = orders.getId(); + + this.deposit_name = orders.getDepositor(); + this.deposit_time = orders.getDepositTime(); + + this.refund_bank = orders.getBank(); + this.refund_account = orders.getAccount(); } }