From 49726442d0bad78c9211b7ea13d688c03b916ff6 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 03 九月 2024 17:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/point/PointGoodsController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/point/PointGoodsController.java b/src/main/java/com/mzl/flower/web/point/PointGoodsController.java
index 858b61b..5368dbd 100644
--- a/src/main/java/com/mzl/flower/web/point/PointGoodsController.java
+++ b/src/main/java/com/mzl/flower/web/point/PointGoodsController.java
@@ -61,11 +61,30 @@
@GetMapping("/list/delete")
@ApiOperation(value = "商品删除")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "商品id", required = true, dataType = "Long", paramType = "query")
+ @ApiImplicitParam(name = "id", value = "商品id", required = true, dataType = "String", paramType = "query")
})
- public ResponseEntity<ReturnDataDTO<?>> deletePointGoods(Long id) {
+ public ResponseEntity<ReturnDataDTO<?>> deletePointGoods(String id) {
pointGoodsService.deletePointGoods(id);
return returnData(R.SUCCESS.getCode(), null);
}
+ @GetMapping("/list/on")
+ @ApiOperation(value = "商品上架")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "商品id", required = true, dataType = "String", paramType = "query")
+ })
+ public ResponseEntity<ReturnDataDTO<?>> upGoods(String id) {
+ pointGoodsService.updateStatus(id, Constants.POINT_GOODS_STATUS.A.name());
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @GetMapping("/list/off")
+ @ApiOperation(value = "商品下架")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "商品id", required = true, dataType = "String", paramType = "query")
+ })
+ public ResponseEntity<ReturnDataDTO<?>> offGoods(String id) {
+ pointGoodsService.updateStatus(id, Constants.POINT_GOODS_STATUS.I.name());
+ return returnData(R.SUCCESS.getCode(), null);
+ }
}
--
Gitblit v1.9.3