From cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 02 九月 2024 16:11:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/point/PointGoodsController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 97614f8..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,9 +61,9 @@
@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);
}
@@ -71,9 +71,9 @@
@GetMapping("/list/on")
@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<?>> upGoods(Long id) {
+ public ResponseEntity<ReturnDataDTO<?>> upGoods(String id) {
pointGoodsService.updateStatus(id, Constants.POINT_GOODS_STATUS.A.name());
return returnData(R.SUCCESS.getCode(), null);
}
@@ -81,9 +81,9 @@
@GetMapping("/list/off")
@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<?>> offGoods(Long id) {
+ 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