From d10ebec3da961f2cff0d96c5e7da4c43f2444e74 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 19:05:14 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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..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,9 +2,14 @@
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;
@@ -22,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(
@@ -54,4 +62,17 @@
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