From d7064002eea6b2bc49e1a4f74f8b6b45d91f0026 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 17:51:32 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 9adebb7..fcdc534 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,10 +2,16 @@
import com.github.pagehelper.PageInfo;
+import com.xzx.gc.common.Result;
+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.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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,10 +19,7 @@
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -24,10 +27,13 @@
@RestController
@Api(tags = {"积分商城--API商品管理"})
@Slf4j
-public class ApiGoodsController {
+public class ApiGoodsController extends BaseController {
@Autowired
private GoodsService goodsService;
+
+ @Autowired
+ private OrderService orderService;
@ApiOperation("分类列表")
@ApiResponses(
@@ -47,4 +53,26 @@
return JsonResult.success(goodsService.findGoodsListInPage(xcxGoodsListDto));
}
+ @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));
+ }
+
+ @ApiOperation("积分商城下单")
+ @PostMapping(value = "/goods/order/add")
+ public Result<String> addOrder(@RequestBody AddGoodsOrderDto addGoodsOrderDto, HttpServletRequest request) {
+ String userId = getUserId(request);
+ addGoodsOrderDto.setUserId(userId);
+
+ orderService.addOrder(addGoodsOrderDto);
+
+ Result<String> result = Result.success();
+ result.setMsg("下单成功");
+ return result;
+ }
+
}
--
Gitblit v1.9.1