From 96dac6da1a20dfa2ecea41544ca21c31c93e7bb2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 14:41:49 +0800
Subject: [PATCH] modify
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiOrderController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiOrderController.java
index 4e1d892..a6c5aac 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiOrderController.java
@@ -2,10 +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.shop.dto.AddGoodsOrderDto;
import com.xzx.gc.shop.dto.XcxOrderListDto;
import com.xzx.gc.shop.service.OrderService;
+import com.xzx.gc.shop.vo.StatisticsVo;
+import com.xzx.gc.shop.vo.XcxOrderDetailsVo;
import com.xzx.gc.shop.vo.XcxOrderListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,9 +17,7 @@
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-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;
@@ -27,6 +29,19 @@
@Autowired
private OrderService orderService;
+ @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;
+ }
+
@ApiOperation("我的订单列表")
@ApiResponses(
@ApiResponse(code = 200, message = "success", response = XcxOrderListVo.class)
@@ -37,4 +52,34 @@
xcxOrderListDto.setUserId(userId);
return JsonResult.success(orderService.orderList(xcxOrderListDto));
}
+
+ @ApiOperation("确认收货")
+ @PostMapping(value = "/order/confirm/{id}")
+ public Result<String> confirmOrder (@PathVariable("id") Long id, HttpServletRequest request) {
+ orderService.confirmOrder(id, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("取消订单")
+ @PostMapping(value = "/order/cancel/{id}")
+ public Result<String> cancelOrder(@PathVariable("id") Long id, HttpServletRequest request) {
+ orderService.cancelOrder(id, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("订单详情")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = XcxOrderDetailsVo.class)
+ })
+ @PostMapping(value = "/order/details/{id}")
+ public JsonResult<XcxOrderDetailsVo> orderDetails(@PathVariable("id") Long id) {
+ return JsonResult.success(orderService.orderDetails(id));
+ }
+
+
+ @ApiOperation("首页统计")
+ @GetMapping(value = "/order/statistics")
+ public JsonResult<StatisticsVo> orderStatistics(HttpServletRequest request) {
+ return JsonResult.success(orderService.orderStatistics(getUserId(request)));
+ }
}
--
Gitblit v1.9.1