From 8d90d3f271a9c28bf46f755b1561f07c163d8823 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期四, 16 五月 2024 17:41:39 +0800 Subject: [PATCH] 代码提交 --- ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java index 63b85ae..22f61dc 100644 --- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java +++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java @@ -44,7 +44,7 @@ if (StringUtils.hasLength(query.getName())){ wrapper.like("name", query.getName()); } - wrapper.ne("isDelete",1); +// wrapper.ne("isDelete",1); wrapper.orderByDesc("id"); List<TGoodsType> list = goodsTypeService.list(wrapper); PageInfo<TGoodsType> res = new PageInfo<>(query.getPageNumber(), query.getPageSize()); @@ -63,9 +63,9 @@ goodsTypeService.updateById(dto); return R.ok("修改成功"); } - @PostMapping("/deleteGoodsType") + @PostMapping("/deleteGoodsType/{id}") @ApiOperation(value = "删除", tags = {"后台-商品类型管理"}) - public R deleteGoodsType(Integer id) { + public R deleteGoodsType(@PathVariable("id")Integer id) { TGoodsType byId = goodsTypeService.getById(id); byId.setIsDelete(1); goodsTypeService.removeById(byId); @@ -81,6 +81,10 @@ } wrapper.orderByDesc("id"); List<TGoods> list = goodsService.list(wrapper); + for (TGoods tGoods : list) { + long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId())); + tGoods.setInventory(goodsId); + } PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize()); res.setRecords(list); return R.ok(res); @@ -91,9 +95,9 @@ goodsService.save(dto); return R.ok("添加成功"); } - @PostMapping("/deleteGoods") + @PostMapping("/deleteGoods/{id}") @ApiOperation(value = "删除", tags = {"后台-商品管理"}) - public R deleteGoods(@RequestParam Integer id) { + public R deleteGoods(@PathVariable("id") Integer id) { TGoods byId = goodsService.getById(id); goodsService.removeById(byId); return R.ok("删除成功"); @@ -104,9 +108,9 @@ goodsService.updateById(dto); return R.ok("修改成功"); } - @PostMapping("/getGoodsInfo") + @PostMapping("/getGoodsInfo/{id}") @ApiOperation(value = "查看详情", tags = {"后台-商品管理"}) - public R<TGoodsVO> getGoodsInfo(@RequestParam Integer id) { + public R<TGoodsVO> getGoodsInfo(@PathVariable("id") Integer id) { TGoodsVO tGoodsVO = new TGoodsVO(); TGoods byId = goodsService.getById(id); BeanUtils.copyProperties(byId,tGoodsVO); -- Gitblit v1.7.1