From cd657f34271f387edb8d72befbcdad37f7bed77a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Jul 2021 15:47:13 +0800
Subject: [PATCH] fix
---
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index 25b69bb..91f6e7a 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -1,16 +1,23 @@
package com.xzx.gc.order.controller;
+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.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
+import com.xzx.gc.order.vo.JhyOrderDetailsVo;
import com.xzx.gc.order.vo.JhyOrderListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@@ -34,10 +41,45 @@
}
@ApiOperation("集物员订单列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = JhyOrderListVo.class)
+ )
@PostMapping(value = "/jhy/order/list")
- public JsonResult<JhyOrderListVo> orderList(@RequestBody JhyOrderListDto jhyOrderListDto) {
- return null;
+ public JsonResult<PageInfo<JhyOrderListVo>> orderList(@RequestBody JhyOrderListDto jhyOrderListDto, HttpServletRequest request) {
+ jhyOrderListDto.setUserId(getUserId(request));
+ PageInfo<JhyOrderListVo> result = jhyOrderService.orderList(jhyOrderListDto);
+ return JsonResult.success(result);
}
+ @ApiOperation("订单明细信息")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = JhyOrderDetailsVo.class)
+ )
+ @PostMapping(value = "/jhy/order/details/{orderId}")
+ public JsonResult<Object> orderDetail(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+ return JsonResult.success(jhyOrderService.orderDetails(orderId, getUserId(request)));
+ }
+
+ @ApiOperation("抢单")
+ @PostMapping(value = "/jhy/order/grab/{orderId}")
+ public Result<String> grabOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+ jhyOrderService.grabOrder(orderId, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("取消订单")
+ @PostMapping(value = "/jhy/order/cancel/{orderId}")
+ public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
+ jhyOrderService.cancelOrder(orderId, getUserId(request));
+ return Result.success();
+ }
+
+ @ApiOperation("确认订单-支付")
+ @PostMapping(value = "/jhy/order/confirm")
+ public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) {
+ confirmDto.setUserId(getUserId(request));
+ jhyOrderService.confirmOrder(confirmDto);
+ return Result.success();
+ }
}
--
Gitblit v1.9.1