From 2c44da15d2ed01cefdc0d9e12497ebbd0ef2c8f9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 11:22:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index 4edee52..4aafb17 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -48,6 +48,9 @@
@PostMapping("/addGoods")
@ApiOperation(value = "发布商品", tags = {"管理后台-商品管理"})
public R<Void> addGoods(@RequestBody Goods goods) {
+ if(goods.getPurchaseLimit()==null){
+ goods.setPurchaseLimit(-1);
+ }
goodsService.addGoods(goods);
return R.ok();
}
@@ -78,6 +81,9 @@
@PutMapping("/manageGoodsUpdate")
@ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
+ if(goods.getPurchaseLimit()==null){
+ goods.setPurchaseLimit(-1);
+ }
goodsService.updateManageGoods(goods);
if (goods.getType()==2){
goods.setAppointStore(2);
@@ -234,5 +240,16 @@
goodsService.updateById(goods);
return R.ok();
}
+
+
+ /**
+ * 获取所有商品
+ * @return
+ */
+ @PostMapping("/getAllGoods")
+ public R<List<Goods>> getAllGoods(){
+ List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
+ return R.ok(list);
+ }
}
--
Gitblit v1.7.1