Merge pull request #54 from 7JEON8KI/fix/banner

백엔드 API 디테일 수정 및 변경 추가
7JEON8KI · Mar 6, 2024 · 042ad6e · 042ad6e
2 parents e836edf + 15ba765
commit 042ad6e
Show file tree

Hide file tree

Showing 15 changed files with 116 additions and 28 deletions.
diff --git a/src/main/java/com/hyundai/domain/admin/controller/AdminBannerController.java b/src/main/java/com/hyundai/domain/admin/controller/AdminBannerController.java
@@ -29,8 +29,8 @@ public ResponseEntity<?> insertBanner(@RequestBody AdminBannerDTO paramDTO){
     public ResponseEntity<?> modifyBanner(@RequestBody AdminBannerDTO paramDTO){
         return ResponseMessage.SuccessResponse("배너 수정 성공", adminBannerService.modifyBanner(paramDTO));
     }
-    @DeleteMapping("/banner")
-    public ResponseEntity<?> deleteBanner(@RequestBody AdminBannerDTO memberDTO){
-        return ResponseMessage.SuccessResponse("배너 삭제 성공", adminBannerService.deleteBanner(memberDTO));
+    @DeleteMapping("/banner/{bannerId}")
+    public ResponseEntity<?> deleteBanner(@PathVariable long bannerId){
+        return ResponseMessage.SuccessResponse("배너 삭제 성공", adminBannerService.deleteBanner(bannerId));
     }
 }
diff --git a/src/main/java/com/hyundai/domain/admin/service/AdminBannerService.java b/src/main/java/com/hyundai/domain/admin/service/AdminBannerService.java
@@ -17,5 +17,5 @@ public interface AdminBannerService {
 
     String modifyBanner(AdminBannerDTO paramDTO);
 
-    String deleteBanner(AdminBannerDTO paramDTO);
+    String deleteBanner(long bannerId);
 }
diff --git a/src/main/java/com/hyundai/domain/admin/service/AdminBannerServiceImpl.java b/src/main/java/com/hyundai/domain/admin/service/AdminBannerServiceImpl.java
@@ -54,8 +54,8 @@ public String modifyBanner(AdminBannerDTO paramDTO) {
     }
 
     @Override
-    public String deleteBanner(AdminBannerDTO paramDTO) {
-        int result = adminBannerMapper.deleteBanner(paramDTO);
+    public String deleteBanner(long bannerId) {
+        int result = adminBannerMapper.deleteBanner(bannerId);
 
         if(result == 1){
             return " ";

diff --git a/src/main/java/com/hyundai/domain/admin/service/AdminMemberServiceImpl.java b/src/main/java/com/hyundai/domain/admin/service/AdminMemberServiceImpl.java
@@ -55,7 +55,7 @@ public String deleteMember(AdminMemberDTO member) {
     @Override
     public String changeMemberAuthorization(AdminManagerDTO member) {
         try{
-            adminMemberMapper.grantAuthorization(member);
+            adminMemberMapper.grantAuthorization(member.getMemberId());
             return "성공";
         } catch (Exception e){
             throw new GlobalException(GlobalErrorCode.NON_CLEAR_REASON);

diff --git a/src/main/java/com/hyundai/domain/manager/controller/ManagerProductController.java b/src/main/java/com/hyundai/domain/manager/controller/ManagerProductController.java
@@ -35,7 +35,7 @@ public ResponseEntity<?> getProductByID(){
 
         return ResponseMessage.SuccessResponse(" 매니저의 상품을 불러왔습니다. ", managerProductService.getProductByMemberId());
     }
-    @PutMapping("/products")
+    @DeleteMapping("/products")
     public ResponseEntity<?> deleteProduct(@RequestBody Map<String, Object> paramDTO){
         return ResponseMessage.SuccessResponse( paramDTO.get("productId") + "번 상품을 삭제했습니다. ", managerProductService.deleteProduct(paramDTO));
     }
@@ -44,7 +44,7 @@ public ResponseEntity<?> addProductIngTheme(@RequestBody Map<String,Object> para
 
         return ResponseMessage.SuccessResponse(" 상품에 재료와 테마를 추가했습니다. ", managerProductService.addProductIngTheme(paramDTO));
     }
-    @PostMapping("/products/deleteIngAndTheme")
+    @DeleteMapping("/products/deleteIngAndTheme")
     public ResponseEntity<?> deleteProductIngTheme(@RequestBody Map<String,Object> paramDTO){
 
         return ResponseMessage.SuccessResponse(" 상품에 재료 또는 테마를 삭제했습니다. ", managerProductService.deleteProductIngTheme(paramDTO));
@@ -53,4 +53,14 @@ public ResponseEntity<?> deleteProductIngTheme(@RequestBody Map<String,Object> p
     public ResponseEntity<?> orderProduct(){
         return ResponseMessage.SuccessResponse("주문한 상품을 불러왔습니다. ", managerProductService.getOrdersByMemberId());
     }
+    @GetMapping("/products/{productId}")
+    public ResponseEntity<?> getProductDetail(@PathVariable long productId){
+        return ResponseMessage.SuccessResponse("상품 상세정보를 불러왔습니다. ", managerProductService.getProductDetail(productId));
+    }
+
+    @PutMapping("/products")
+    public ResponseEntity<?> modifyProduct(@RequestBody ManagerProductDTO paramDTO){
+        return ResponseMessage.SuccessResponse("상품을 수정했습니다. ", managerProductService.modifyProduct(paramDTO));
+    }
+    // 상품 수정하기, 주문 상태여부 수정 //
 }
diff --git a/src/main/java/com/hyundai/domain/manager/dto/ManagerOrderProductDTO.java b/src/main/java/com/hyundai/domain/manager/dto/ManagerOrderProductDTO.java
@@ -19,10 +19,10 @@
 @AllArgsConstructor
 @RequiredArgsConstructor
 public class ManagerOrderProductDTO {
-    private Long orderDetailId;
+    private Long orderProductId;
     private Long orderId;
     private Long productId;
-    private Long orderProductCnt;
+    private Long orderProductCount;
     private Long orderProductPrice;
     private Long orderProductDiscount;
 
@@ -36,4 +36,4 @@ public class ManagerOrderProductDTO {
     private String orderNumber;
     private String orderRequired;
     private String paymentMethod;
-}
+}
diff --git a/src/main/java/com/hyundai/domain/manager/service/ManagerProductService.java b/src/main/java/com/hyundai/domain/manager/service/ManagerProductService.java
@@ -25,4 +25,8 @@ public interface ManagerProductService {
     String deleteProductIngTheme(Map<String, Object> params);
 
     List<ManagerOrderProductDTO> getOrdersByMemberId();
+
+    ManagerProductDTO getProductDetail(long productId);
+
+    String modifyProduct(ManagerProductDTO productDTO);
 }
diff --git a/src/main/java/com/hyundai/domain/manager/service/ManagerProductServiceImpl.java b/src/main/java/com/hyundai/domain/manager/service/ManagerProductServiceImpl.java
@@ -32,8 +32,7 @@ public class ManagerProductServiceImpl implements ManagerProductService{
     public String insertProduct(ManagerProductDTO productDTO) {
         String memberId = ((CustomMemberDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getMemberId();
 
-        ManagerProductDTO data = ManagerProductDTO.builder()
-                .productId(productDTO.getProductId()) // productId는 sequence로 자동 생성
+        ManagerProductDTO data = ManagerProductDTO.builder()// productId는 sequence로 자동 생성
                 .memberId(memberId)
                 .productName(productDTO.getProductName())
                 .productSubName(productDTO.getProductSubName())
@@ -134,4 +133,20 @@ public List<ManagerOrderProductDTO> getOrdersByMemberId() {
             throw new GlobalException(GlobalErrorCode.NON_CLEAR_REASON);
         }
     }
+
+    @Override
+    public ManagerProductDTO getProductDetail(long productId) {
+        return managerMapper.getProductDetail(productId);
+    }
+
+    @Override
+    public String modifyProduct(ManagerProductDTO productDTO) {
+        try {
+            managerMapper.modifyProduct(productDTO);
+            return " ";
+        }
+        catch (Exception e){
+            throw new GlobalException(GlobalErrorCode.NON_CLEAR_REASON);
+        }
+    }
 }
diff --git a/src/main/java/com/hyundai/global/mapper/AdminBannerMapper.java b/src/main/java/com/hyundai/global/mapper/AdminBannerMapper.java
@@ -17,5 +17,5 @@ public interface AdminBannerMapper {
 
     int modifyBanner(AdminBannerDTO paramDTO);
 
-    int deleteBanner(AdminBannerDTO paramDTO);
+    int deleteBanner(long bannerId);
 }
diff --git a/src/main/java/com/hyundai/global/mapper/AdminMemberMapper.java b/src/main/java/com/hyundai/global/mapper/AdminMemberMapper.java
@@ -12,7 +12,7 @@ public interface AdminMemberMapper {
 
     void deleteMember(AdminMemberDTO memberDTO);
 
-    void grantAuthorization(AdminManagerDTO managerDTO);
+    void grantAuthorization(String memberId);
 
     List<AdminMemberDTO> searchMembers(String word);
 

diff --git a/src/main/java/com/hyundai/global/mapper/ManagerMapper.java b/src/main/java/com/hyundai/global/mapper/ManagerMapper.java
@@ -1,10 +1,7 @@
 package com.hyundai.global.mapper;
 
-import com.hyundai.domain.admin.dto.AdminMemberDTO;
-import com.hyundai.domain.admin.dto.AdminMemberParamDTO;
 import com.hyundai.domain.manager.dto.ManagerProductDTO;
 
-import java.util.List;
 import java.util.Map;
 
 public interface ManagerMapper {
@@ -19,4 +16,8 @@ public interface ManagerMapper {
     void deleteProductIngTheme(Map<String,Object> params);
 
     void getOrdersByMemberId(Map<String,Object> params);
+
+    ManagerProductDTO getProductDetail(long productId);
+
+    void modifyProduct(ManagerProductDTO productDTO);
 }
diff --git a/src/main/resources/com/hyundai/global/mapper/AdminBannerMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminBannerMapper.xml
@@ -49,7 +49,7 @@
             banner_id = #{bannerId}
     </update>
 
-    <update id="deleteBanner" parameterType="com.hyundai.domain.admin.dto.AdminBannerDTO">
+    <update id="deleteBanner" >
         UPDATE
             tbl_banner
         SET

diff --git a/src/main/resources/com/hyundai/global/mapper/AdminMemberMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminMemberMapper.xml
@@ -69,8 +69,8 @@
         JOIN tbl_member_info mi on m.member_id = mi.member_id
         WHERE 1=1
             AND m.deleted_at IS NULL
-            AND m.member_role = 'ROLE_MANAGER'
-            AND s.approved_at IS NOT NULL
+--             AND m.member_role = 'ROLE_MANAGER'
+--             AND s.approved_at IS NOT NULL
     </select>
 
     <update id="modifyMember" parameterType="com.hyundai.domain.admin.dto.AdminMemberDTO">

diff --git a/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml
@@ -154,4 +154,23 @@
 
 
 
+
+    <update id="modifyProduct" parameterType="com.hyundai.domain.manager.dto.ManagerProductDTO">
+        UPDATE tbl_product
+        SET
+            product_name = #{productName},
+            product_sub_name = #{productSubName},
+            price = #{price},
+            stock = #{stock},
+            discount_rate = #{discountRate},
+            product_detail = #{productDetail},
+            amount = #{amount},
+            calorie = #{calorie},
+            storage = #{storage},
+            thumbnail_image_url = #{thumbnailImageUrl},
+            created_at = #{createdAt}
+        WHERE
+            product_id = #{productId}
+          AND deleted_at IS NULL
+    </update>
 </mapper>
diff --git a/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml b/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml
@@ -21,10 +21,10 @@
     </resultMap>
 
     <resultMap id="orderProductMap" type="com.hyundai.domain.manager.dto.ManagerOrderProductDTO">
-        <id property="orderDetailId" column="order_detail_id"/>
+        <id property="orderProductId" column="orderproduct_id"/>
         <result property="orderId" column="order_id"/>
         <result property="productId" column="product_id"/>
-        <result property="orderProductCnt" column="order_product_cnt"/>
+        <result property="orderProductCount" column="order_product_count"/>
         <result property="orderProductPrice" column="order_product_price"/>
         <result property="orderProductDiscount" column="order_product_discount"/>
 
@@ -44,7 +44,6 @@
     <insert id="insertProduct" parameterType="com.hyundai.domain.manager.dto.ManagerProductDTO">
         {call MANAGER.INSERT_PRODUCT(
                 #{memberId, mode=IN, jdbcType=VARCHAR},
-                #{productId, mode=IN, jdbcType=INTEGER},
                 #{productName, mode=IN, jdbcType=VARCHAR},
                 #{productSubName, mode=IN, jdbcType=VARCHAR},
                 #{price, mode=IN, jdbcType=INTEGER},
@@ -54,7 +53,7 @@
                 #{productDetail, mode=IN, jdbcType=VARCHAR},
                 #{amount, mode=IN, jdbcType=INTEGER},
                 #{calorie, mode=IN, jdbcType=INTEGER},
-                #{storage, mode=IN, jdbcType=INTEGER},
+                #{storage, mode=IN, jdbcType=VARCHAR},
                 #{thumbnailImageUrl, mode=IN, jdbcType=VARCHAR}
               )}
     </insert>
@@ -65,7 +64,7 @@
                 #{result, mode=OUT, jdbcType=CURSOR, javaType=ResultSet, resultMap=managerProductMap}
               )}
     </select>
-    <update id="deleteProduct"  parameterType="map">
+    <update id="deleteProduct" parameterType="map">
         {call MANAGER.MANAGER_DELETE_PRODUCT(
                 #{productId, mode=IN, jdbcType=INTEGER},
                 #{memberId, mode=IN, jdbcType=VARCHAR}
@@ -105,4 +104,44 @@
                 #{result, mode=OUT, jdbcType=CURSOR, javaType=ResultSet, resultMap=orderProductMap}
               )}
     </select>
-</mapper>
+
+    <select id="getProductDetail" resultMap="managerProductMap">
+        select product_id,
+               product_name,
+               product_sub_name,
+               price,
+               product_type,
+               stock,
+               discount_rate,
+               product_detail,
+               amount,
+               calorie,
+               storage,
+               thumbnail_image_url,
+               created_at
+        from tbl_product
+        where product_id = #{productId}
+        AND deleted_at IS NULL
+    </select>
+
+    <update id="modifyProduct" parameterType="com.hyundai.domain.manager.dto.ManagerProductDTO">
+        UPDATE tbl_product
+        SET
+            product_name = #{productName},
+            product_sub_name = #{productSubName},
+            price = #{price},
+            stock = #{stock},
+            discount_rate = #{discountRate},
+            product_detail = #{productDetail},
+            amount = #{amount},
+            calorie = #{calorie},
+            storage = #{storage},
+            thumbnail_image_url = #{thumbnailImageUrl},
+            created_at = #{createdAt}
+        WHERE
+            product_id = #{productId}
+          AND deleted_at IS NULL
+    </update>
+
+</mapper>
+