From 3ccbf5989183a6a9d79f501c7d68af9d132d31b0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 19:10:09 +0800
Subject: [PATCH] add jhyOrderDetails

---
 gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java |   22 ++++++++++++++++++++--
 1 files changed, 20 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..6d6f5c9 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,21 @@
 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.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.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 +39,23 @@
     }
 
     @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)));
+    }
 
 }

--
Gitblit v1.9.1