From ef7b9261a7324a403eb2b0dac5a9a12938dda237 Mon Sep 17 00:00:00 2001 From: EunKu Date: Wed, 6 Mar 2024 11:11:30 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=B0=B0=EB=84=88=20=EC=A1=B0=ED=9A=8C=20A?= =?UTF-8?q?PI=20FIX(=EA=B8=B0=EA=B0=84=20=EB=82=B4=20=EC=A1=B0=ED=9A=8C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminMemberServiceImpl.java | 2 +- .../controller/ManagerProductController.java | 14 ++++- .../manager/dto/ManagerOrderProductDTO.java | 6 +-- .../service/ManagerProductService.java | 4 ++ .../service/ManagerProductServiceImpl.java | 19 ++++++- .../global/mapper/AdminMemberMapper.java | 2 +- .../hyundai/global/mapper/ManagerMapper.java | 7 +-- .../global/mapper/AdminMemberMapper.xml | 4 +- .../global/mapper/AdminProductMapper.xml | 19 +++++++ .../hyundai/global/mapper/ManagerMapper.xml | 51 ++++++++++++++++--- 10 files changed, 108 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/hyundai/domain/admin/service/AdminMemberServiceImpl.java b/src/main/java/com/hyundai/domain/admin/service/AdminMemberServiceImpl.java index b881526..2dc9c08 100644 --- 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 index 9749db6..6773dd2 100644 --- 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 paramDTO){ return ResponseMessage.SuccessResponse( paramDTO.get("productId") + "번 상품을 삭제했습니다. ", managerProductService.deleteProduct(paramDTO)); } @@ -44,7 +44,7 @@ public ResponseEntity addProductIngTheme(@RequestBody Map para return ResponseMessage.SuccessResponse(" 상품에 재료와 테마를 추가했습니다. ", managerProductService.addProductIngTheme(paramDTO)); } - @PostMapping("/products/deleteIngAndTheme") + @DeleteMapping("/products/deleteIngAndTheme") public ResponseEntity deleteProductIngTheme(@RequestBody Map paramDTO){ return ResponseMessage.SuccessResponse(" 상품에 재료 또는 테마를 삭제했습니다. ", managerProductService.deleteProductIngTheme(paramDTO)); @@ -53,4 +53,14 @@ public ResponseEntity deleteProductIngTheme(@RequestBody Map 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)); + } + // 상품 수정하기, 주문 상태여부 수정 // } \ No newline at end of file diff --git a/src/main/java/com/hyundai/domain/manager/dto/ManagerOrderProductDTO.java b/src/main/java/com/hyundai/domain/manager/dto/ManagerOrderProductDTO.java index 6fe0404..aa0e72b 100644 --- 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; -} +} \ No newline at end of file diff --git a/src/main/java/com/hyundai/domain/manager/service/ManagerProductService.java b/src/main/java/com/hyundai/domain/manager/service/ManagerProductService.java index d25e4ae..889a6e8 100644 --- 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 params); List 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 index d63dd3d..22cce18 100644 --- 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 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/AdminMemberMapper.java b/src/main/java/com/hyundai/global/mapper/AdminMemberMapper.java index 4416568..1a8767e 100644 --- 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 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 index 8cdb0a7..0b34f8a 100644 --- 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 params); void getOrdersByMemberId(Map params); + + ManagerProductDTO getProductDetail(long productId); + + void modifyProduct(ManagerProductDTO productDTO); } diff --git a/src/main/resources/com/hyundai/global/mapper/AdminMemberMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminMemberMapper.xml index 4211340..ec2e0a5 100644 --- 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 diff --git a/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml index 630afee..f7503ff 100644 --- a/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml +++ b/src/main/resources/com/hyundai/global/mapper/AdminProductMapper.xml @@ -108,4 +108,23 @@ set theme_name = #{themeName}, theme_description = #{themeDescription} + + + 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 + \ No newline at end of file diff --git a/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml b/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml index e0fe851..b94e8f4 100644 --- a/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml +++ b/src/main/resources/com/hyundai/global/mapper/ManagerMapper.xml @@ -21,10 +21,10 @@ - + - + @@ -44,7 +44,6 @@ {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} )} @@ -65,7 +64,7 @@ #{result, mode=OUT, jdbcType=CURSOR, javaType=ResultSet, resultMap=managerProductMap} )} - + {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} )} - \ No newline at end of file + + + + + 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 + + + + From 15ba765626964ad251a47ff86d00b966aca83373 Mon Sep 17 00:00:00 2001 From: EunKu Date: Wed, 6 Mar 2024 15:54:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EB=B0=B0=EB=84=88=20delete=20URL=ED=8C=8C?= =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=EB=A1=9C=20=EB=B0=9B=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/admin/controller/AdminBannerController.java | 6 +++--- .../hyundai/domain/admin/service/AdminBannerService.java | 2 +- .../domain/admin/service/AdminBannerServiceImpl.java | 4 ++-- .../java/com/hyundai/global/mapper/AdminBannerMapper.java | 2 +- .../com/hyundai/global/mapper/AdminBannerMapper.xml | 2 +- 5 files changed, 8 insertions(+), 8 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 index 524cbe8..e918b2c 100644 --- 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)); } } \ No newline at end of file diff --git a/src/main/java/com/hyundai/domain/admin/service/AdminBannerService.java b/src/main/java/com/hyundai/domain/admin/service/AdminBannerService.java index 88e6052..79d5244 100644 --- 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 index c1c71bc..9570ec9 100644 --- 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/global/mapper/AdminBannerMapper.java b/src/main/java/com/hyundai/global/mapper/AdminBannerMapper.java index f521479..f8200fa 100644 --- 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/resources/com/hyundai/global/mapper/AdminBannerMapper.xml b/src/main/resources/com/hyundai/global/mapper/AdminBannerMapper.xml index c2503c5..478e356 100644 --- 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 tbl_banner SET