Merge pull request #51 from UMC-neoul/develop

상품 할인률 관련 코드 수정
UMC-neoul · Aug 21, 2023 · ada0ac1 · ada0ac1
2 parents 687cdc3 + 9d71730
commit ada0ac1
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/src/main/java/com/example/neoul/dto/product/ProductRes.java b/src/main/java/com/example/neoul/dto/product/ProductRes.java
@@ -16,13 +16,15 @@ public class ProductRes {
     @Setter
     @Getter
     // main - 상품 상세조회
-    public static class ProductDetailRes {
+    public static class ProductDetailRes { //todo 상품 할인률, 할인가 추가
         private Long productId; //상품 id
         private Long brandId; //브랜드 id
         private Long categoryPId; //카테고리 id
         private String categoryName; //상품 카테고리
         private String productName; //상품명
         private Integer price; //상품금액
+        private Integer discountedRatio; //상품 할인률
+        private Integer discountedSalePrice; //상품 할인가
         private List<String> productImgList; //상품사진
         private String deliveryInfo; //상품 배송정보 (무료배송 etc..)
         private String productUrl; //상품상세 url
@@ -71,9 +73,15 @@ public static class getLikedProductRes {
     @Builder
     @Setter
     @Getter
-    public static class LikedProductList {
-        private Long productId; //브랜드 id
-        private String productName; //브랜드 이름
+    public static class LikedProductList { //상품 이미지,브랜드 이름, 가격, 할인률 추가
+        private Long productId; //상품 id
+        private String productName; //상품명
+        private List<String> productImgList; //상품사진
+        private Long brandId; //브랜드 id
+        private String brandName; //브랜드 이름
+        private Integer price; //상품금액
+        private Integer discountedRatio; //상품 할인률
+        private Integer discountedSalePrice; //상품 할인가
     }
 
 

diff --git a/src/main/java/com/example/neoul/entity/brand/Product.java b/src/main/java/com/example/neoul/entity/brand/Product.java
@@ -45,6 +45,12 @@ public class Product extends BaseEntity {
 
     private Integer price;
 
+    @Column(name = "discounted_ratio")
+    private Integer discountedRatio; //상품 할인률
+
+    @Column(name = "discounted_sale_price")
+    private Integer discountedSalePrice; //상품 할인가
+
     @Column(name = "delivery_info")
     private String deliveryInfo; //배송정보
 

diff --git a/src/main/java/com/example/neoul/service/ProductService.java b/src/main/java/com/example/neoul/service/ProductService.java
@@ -65,6 +65,8 @@ public ProductRes.ProductDetailRes getProduct(Long productId) {
                 .categoryName(product.getCategoryP().getName()) //얘는 살려야함
                 .productName(product.getName())
                 .price(product.getPrice())
+                .discountedRatio(product.getDiscountedRatio())
+                .discountedSalePrice(product.getDiscountedSalePrice())
                 .productImgList(productImgList) //얘는 살려야함
                 .deliveryInfo(product.getDeliveryInfo())
                 .productUrl(product.getProductUrl())