From 138d2a2c62983d98fd63369b138556a82d4649b0 Mon Sep 17 00:00:00 2001 From: stivepeim Date: Fri, 20 Nov 2020 15:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=A0=E9=99=A4=E5=95=86?= =?UTF-8?q?=E5=93=81=20=E5=92=8C=E5=9B=9E=E6=94=B6=E7=AB=99=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=95=86=E5=93=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/store.js | 12 ++++++------ admin/src/views/store/index.vue | 7 ++++--- .../store/controller/StoreProductController.java | 13 +++++++------ .../crmeb/store/service/StoreProductService.java | 2 +- .../store/service/impl/StoreProductServiceImpl.java | 8 +++++++- crmeb/src/main/resources/logback-spring.xml | 8 ++++---- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/admin/src/api/store.js b/admin/src/api/store.js index 34953b52..64a6cca6 100644 --- a/admin/src/api/store.js +++ b/admin/src/api/store.js @@ -39,10 +39,11 @@ export function productDetailApi(id) { * 删除商品 * @param pram */ -export function productDeleteApi(id) { +export function productDeleteApi(id, type) { return request({ url: `/admin/store/product/delete/${id}`, - method: 'get' + method: 'get', + params:{type:type} }) } @@ -245,10 +246,9 @@ export function importProductApi(params) { * 恢复 * @param pram */ -export function restoreApi(params) { +export function restoreApi(id) { return request({ - url: `/admin/store/product/importProduct`, - method: 'post', - params + url: `/admin/store/product/restore/${id}`, + method: 'get' }) } diff --git a/admin/src/views/store/index.vue b/admin/src/views/store/index.vue index 647ef04c..33af9034 100644 --- a/admin/src/views/store/index.vue +++ b/admin/src/views/store/index.vue @@ -254,9 +254,10 @@ export default { this.getList() }, // 删除 - handleDelete(id, idx) { - this.$modalSure().then(() => { - productDeleteApi(id).then(() => { + handleDelete(id, type) { + this.$modalSure(`删除 id 为 ${id} 的商品`).then(() => { + const deleteFlag = type == 5 ? 'delete':'recycle'; + productDeleteApi(id,deleteFlag).then(() => { this.$message.success('删除成功') this.getList() this.goodHeade(); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductController.java b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductController.java index a9077bc5..0ced47c7 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductController.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/controller/StoreProductController.java @@ -74,15 +74,16 @@ public class StoreProductController { } /** - * 删除商品表 - * @param id Integer - * @author Mr.Zhang - * @since 2020-05-27 + * 删除商品 + * @param id 商品id + * @param type 删除类型 recycle 回收站 delete 物理删除 + * @return */ @ApiOperation(value = "删除") @RequestMapping(value = "/delete/{id}", method = RequestMethod.GET) - public CommonResult delete(@RequestBody @PathVariable Integer id){ - if(storeProductService.deleteProduct(id)){ + public CommonResult delete(@PathVariable Integer id, + @RequestParam(value = "type", required = false, defaultValue = "recycle")String type){ + if(storeProductService.deleteProduct(id, type)){ // if(storeProductService.removeById(id)){ storeCartService.productStatusNotEnable(id); return CommonResult.success(); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreProductService.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreProductService.java index c8f13f71..46091086 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreProductService.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/StoreProductService.java @@ -126,7 +126,7 @@ public interface StoreProductService extends IService { * @param productId 商品id * @return 删除结果 */ - boolean deleteProduct(Integer productId); + boolean deleteProduct(Integer productId, String type); /** * 恢复已删除商品 diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java index 173beae8..478d4a11 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreProductServiceImpl.java @@ -1,5 +1,6 @@ package com.zbkj.crmeb.store.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -919,8 +920,13 @@ public class StoreProductServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + if (StrUtil.isNotBlank(type) && "delete".equals(type)) { + lambdaUpdateWrapper.eq(StoreProduct::getId, productId); + int delete = dao.delete(lambdaUpdateWrapper); + return delete > 0; + } lambdaUpdateWrapper.eq(StoreProduct::getId, productId); lambdaUpdateWrapper.set(StoreProduct::getIsDel, true); return update(lambdaUpdateWrapper); diff --git a/crmeb/src/main/resources/logback-spring.xml b/crmeb/src/main/resources/logback-spring.xml index 7a1f40dd..d774fe5c 100644 --- a/crmeb/src/main/resources/logback-spring.xml +++ b/crmeb/src/main/resources/logback-spring.xml @@ -223,10 +223,10 @@ - - - - + + + +