From 12542f379312598f83a50893584944e51fc0f2b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Oct 2021 16:06:43 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java
index ecf8941..2d92486 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java
@@ -3,16 +3,15 @@
import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.Result;
+import com.xzx.gc.common.annotations.PassToken;
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.service.BaseAccountService;
-import com.xzx.gc.shop.dto.AddGoodsOrderDto;
-import com.xzx.gc.shop.dto.XcxGoodsListDto;
+import com.xzx.gc.shop.dto.*;
import com.xzx.gc.shop.service.GoodsService;
import com.xzx.gc.shop.service.OrderService;
-import com.xzx.gc.shop.vo.GoodsCategoryVo;
-import com.xzx.gc.shop.vo.XcxGoodsDetailVo;
-import com.xzx.gc.shop.vo.XcxGoodsListVo;
+import com.xzx.gc.shop.service.ScoreDetailsService;
+import com.xzx.gc.shop.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -23,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.List;
+import java.util.Map;
@RestController
@Api(tags = {"积分商城--API商品管理"})
@@ -32,9 +32,7 @@
@Autowired
private GoodsService goodsService;
- @Autowired
- private OrderService orderService;
-
+ @PassToken
@ApiOperation("分类列表")
@ApiResponses(
@ApiResponse(code = 200, message = "success", response = GoodsCategoryVo.class)
@@ -44,15 +42,19 @@
return JsonResult.success(goodsService.findCategoryWithChildren());
}
+ @PassToken
@ApiOperation("商品列表")
@ApiResponses(
@ApiResponse(code = 200, message = "success", response = XcxGoodsListVo.class)
)
@PostMapping(value = "/goods/goodsList")
public JsonResult<PageInfo<XcxGoodsListVo>> goodsList(@RequestBody XcxGoodsListDto xcxGoodsListDto, HttpServletRequest request) {
+ String userId = getUserId(request);
+ xcxGoodsListDto.setUserId(userId);
return JsonResult.success(goodsService.findGoodsListInPage(xcxGoodsListDto));
}
+ @PassToken
@ApiOperation("商品详情")
@ApiResponses(
@ApiResponse(code = 200, message = "success", response = XcxGoodsDetailVo.class)
@@ -62,4 +64,29 @@
return JsonResult.success(goodsService.findGoodsDetails(id));
}
+ @ApiOperation("商品搜索历史记录")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = GoodsSearchVo.class)
+ )
+ @PostMapping(value = "/goods/goodsSearch")
+ public JsonResult<List<GoodsSearchVo>> goodsSearch(@RequestBody GoodsSearchDto goodsSearchDto, HttpServletRequest request) {
+ String userId = getUserId(request);
+ goodsSearchDto.setUserId(userId);
+ return JsonResult.success(goodsService.goodsSearch(goodsSearchDto));
+ }
+
+ @ApiOperation("商品搜索历史记录--删除")
+ @PostMapping(value = "/goods/delGoodsSearch/{id}")
+ public Result<String> delGoodsSearch (@PathVariable("id") Long id, HttpServletRequest request) {
+ goodsService.delGoodsSearch(id, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("商品搜索历史记录--全部清空")
+ @PostMapping(value = "/goods/delAllSearch")
+ public Result<String> delAllSearch (@RequestBody GoodsSearchDto goodsSearchDto, HttpServletRequest request) {
+ goodsService.delAllSearch(getUserId(request));
+ return Result.success();
+ }
+
}
--
Gitblit v1.9.1