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 | 7 +++----
1 files changed, 3 insertions(+), 4 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 22f61dc..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
@@ -71,9 +71,8 @@
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())){
@@ -116,13 +115,13 @@
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