From d95c4537ad861e25f4371fc62feb16122dc4ac2d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 09:03:20 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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..ac65535 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,17 +63,16 @@
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);
return R.ok("删除成功");
}
- @GetMapping("/listAll")
+ @PostMapping("/listAll")
@ApiOperation(value = "列表查询", tags = {"后台-商品管理"})
-
public R<PageInfo<TGoods>> listAll(@RequestBody GoodsTypeQuery query){
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
if (StringUtils.hasLength(query.getName())){
@@ -81,6 +80,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 +94,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,21 +107,21 @@
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);
long goodsId = orderService.count(new QueryWrapper<TOrder>().eq("goodsId", id));
tGoodsVO.setInventory(goodsId);
+ tGoodsVO.setIntegral(byId.getIntegral());
return R.ok(tGoodsVO);
}
@PostMapping("/getGoodsTypeList")
@ApiOperation(value = "获取商品类型列表", tags = {"后台-商品管理"})
public R<List<TGoodsType>> getGoodsInfo() {
- List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>()
- .ne("isDelete", 1));
+ List<TGoodsType> res = goodsTypeService.list(new QueryWrapper<TGoodsType>());
return R.ok(res);
}
--
Gitblit v1.7.1