From 0561b12e8c5570a0f7e812543cc3460f80fee416 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Nov 2021 10:29:28 +0800
Subject: [PATCH] 20211108

---
 gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java |   21 +++++++++++++--------
 1 files changed, 13 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 3311f05..7893664 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,6 +3,7 @@
 
 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;
@@ -31,6 +32,7 @@
     @Autowired
     private GoodsService goodsService;
 
+    @PassToken
     @ApiOperation("分类列表")
     @ApiResponses(
             @ApiResponse(code = 200, message = "success", response = GoodsCategoryVo.class)
@@ -40,24 +42,27 @@
         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 frontClient = getFrontClient(request);
-        xcxGoodsListDto.setUserId(frontClient);
+        String userId = getUserId(request);
+        xcxGoodsListDto.setUserId(userId);
         return JsonResult.success(goodsService.findGoodsListInPage(xcxGoodsListDto));
     }
 
+    @PassToken
     @ApiOperation("商品详情")
     @ApiResponses(
             @ApiResponse(code = 200, message = "success", response = XcxGoodsDetailVo.class)
     )
     @PostMapping(value = "/goods/goodsDetails/{id}")
-    public JsonResult<XcxGoodsDetailVo> goodsDetails(@PathVariable("id") Long id) {
-        return JsonResult.success(goodsService.findGoodsDetails(id));
+    public JsonResult<XcxGoodsDetailVo> goodsDetails(@PathVariable("id") Long id ,HttpServletRequest request) {
+        String userId = getUserId(request);
+        return JsonResult.success(goodsService.findGoodsDetails(id,userId));
     }
 
     @ApiOperation("商品搜索历史记录")
@@ -66,22 +71,22 @@
     )
     @PostMapping(value = "/goods/goodsSearch")
     public JsonResult<List<GoodsSearchVo>> goodsSearch(@RequestBody GoodsSearchDto goodsSearchDto, HttpServletRequest request) {
-        String frontClient = getFrontClient(request);
-        goodsSearchDto.setUserId(frontClient);
+        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, getFrontClient(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(getFrontClient(request));
+        goodsService.delAllSearch(getUserId(request));
         return Result.success();
     }
 

--
Gitblit v1.9.1