From cb15936f61ca0fc35d6e2c3d0e3c95c506484c18 Mon Sep 17 00:00:00 2001 From: wxy Date: Fri, 5 Apr 2024 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/product/controller/CategoryController.java | 7 +++++-- .../com/muyu/product/controller/ProductController.java | 7 +++++++ .../main/java/com/muyu/product/mapper/ProductMapper.java | 2 ++ .../java/com/muyu/product/service/ProductService.java | 1 + .../muyu/product/service/impl/CategoryServiceImpl.java | 4 ++-- .../muyu/product/service/impl/ProductServiceImpl.java | 5 +++++ .../src/main/resources/mapper/product/ProductMapper.xml | 9 ++++++++- 7 files changed, 30 insertions(+), 5 deletions(-) diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryController.java index 5ef6899..761fd4c 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/CategoryController.java @@ -38,9 +38,12 @@ public class CategoryController { @PostMapping @ApiOperation("分类添加") - public AjaxResult insertCategory(@RequestBody Category category){ + public AjaxResult insertCategory(@RequestBody(required = false) Category category){ + if (category == null) { + return AjaxResult.error("请求体不能为空"); + } Integer res = categoryService.insertCategory(category); - return AjaxResult.success(res==1?"添加成功":"添加失败"); + return AjaxResult.success(res == 1 ? "添加成功" : "添加失败"); } @PutMapping diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java index ff8efc3..454db16 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/ProductController.java @@ -57,6 +57,13 @@ public class ProductController { return R.ok(); } + @ApiOperation("删除商品") + @DeleteMapping("{id}") + public AjaxResult deleteProduct(@PathVariable Integer id){ + Integer res = productService.deleteProduct(id); + return AjaxResult.success(res==1?"删除成功":"删除失败"); + } + @ApiOperation("图片上传") @PostMapping("/upload") diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java index 4bbd40c..f60939b 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/ProductMapper.java @@ -20,4 +20,6 @@ public interface ProductMapper { void updateMothodId(Integer id); Integer findProductNumber(ProductReq productReq); + + Integer deleteProduct(Integer id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java index 4f4e57f..b07b728 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/ProductService.java @@ -18,4 +18,5 @@ public interface ProductService { void productInsert(ProductReq productReq); + Integer deleteProduct(Integer id); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryServiceImpl.java index f620eb5..d95b093 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/CategoryServiceImpl.java @@ -30,13 +30,13 @@ public class CategoryServiceImpl implements CategoryService { @Override public Integer insertCategory(Category category) { - category.setCategoryName(SecurityUtils.getUsername()); + category.setCreateBy(SecurityUtils.getUsername()); return categoryMapper.insertCategory(category); } @Override public Integer updateCategory(Category category) { - category.setCategoryName(SecurityUtils.getUsername()); + category.setCreateBy(SecurityUtils.getUsername()); return categoryMapper.updateCategory(category); } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java index 65fdb75..f5d4e58 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/ProductServiceImpl.java @@ -124,6 +124,11 @@ public class ProductServiceImpl implements ProductService { } + @Override + public Integer deleteProduct(Integer id) { + return productMapper.deleteProduct(id); + } + private void insertProductSku(ProductReq productReq) { List productSkuList = productReq.getProductSkus(); int productId = productReq.getProduct().getId(); diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml index 6470cbe..8e81702 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ProductMapper.xml @@ -64,8 +64,15 @@ NOW() ); - + + + + update t_product set method_id =#{methodId} where id = #{id} + + + + update t_product set id_delete = 0 where id = #{id}