From 4a0980a5d393f6b78961d221d45a1951eb1bd51e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 17:51:38 +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/AdminJhyOrderController.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
index 1f562f9..973ed03 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
@@ -5,10 +5,10 @@
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.shop.dto.QueryGoodsListDto;
import com.xzx.gc.shop.dto.QueryJhyOrderListDto;
+import com.xzx.gc.shop.dto.ViewGoodsDto;
+import com.xzx.gc.shop.dto.ViewJhyOrderDto;
import com.xzx.gc.shop.service.JhyService;
-import com.xzx.gc.shop.vo.QueryGoodsListVo;
-import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
-import com.xzx.gc.shop.vo.QueryOrderListVo;
+import com.xzx.gc.shop.vo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
@@ -41,5 +41,17 @@
return JsonResult.success(result);
}
+ /**
+ * 查看商品详情
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/score/jhy/viewJhyOrder.json")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewJhyOrderVo.class)})
+ @ApiOperation(value="集物员管理-查看订单详情", notes="test: 仅0有正确返回")
+ public JsonResult<ViewJhyOrderVo> viewJhyOrder(@RequestBody ViewJhyOrderDto viewJhyOrderDto) {
+ Long id = viewJhyOrderDto.getId();
+ ViewJhyOrderVo viewJhyOrderVo = jhyService.viewJhyOrder(id);
+ return JsonResult.success(viewJhyOrderVo);
+ }
+
}
--
Gitblit v1.9.1