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 |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 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 4addc19..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
@@ -2,12 +2,16 @@
 
 
 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.shop.dto.XcxGoodsListDto;
+import com.xzx.gc.service.BaseAccountService;
+import com.xzx.gc.shop.dto.*;
 import com.xzx.gc.shop.service.GoodsService;
-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.OrderService;
+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;
@@ -18,15 +22,17 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 @RestController
 @Api(tags = {"积分商城--API商品管理"})
 @Slf4j
-public class ApiGoodsController {
+public class ApiGoodsController extends BaseController {
 
     @Autowired
     private GoodsService goodsService;
 
+    @PassToken
     @ApiOperation("分类列表")
     @ApiResponses(
             @ApiResponse(code = 200, message = "success", response = GoodsCategoryVo.class)
@@ -36,22 +42,52 @@
         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)
     )
     @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("商品搜索历史记录")
+    @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