From 64a787288e4fc42bae9aa214dc5b470185e791ac Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 25 Jun 2021 15:34:20 +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 | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 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
new file mode 100644
index 0000000..1f562f9
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java
@@ -0,0 +1,45 @@
+package com.xzx.gc.shop.controller;
+
+import com.xzx.gc.common.constant.Constants;
+import com.xzx.gc.common.request.BaseController;
+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.service.JhyService;
+import com.xzx.gc.shop.vo.QueryGoodsListVo;
+import com.xzx.gc.shop.vo.QueryJhyOrderListVo;
+import com.xzx.gc.shop.vo.QueryOrderListVo;
+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.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+@RestController
+@Api(tags = {"集物员管理"})
+@Slf4j
+public class AdminJhyOrderController extends BaseController {
+
+ @Resource
+ JhyService jhyService;
+
+ /**
+ * 订单列表
+ * xzx_jhy_order 集货员订单表
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX+"/score/jhy/queryOrderList.json")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = QueryJhyOrderListVo.class)})
+ @ApiOperation(value = "集物员管理-订单列表", notes = "test: 仅0有正确返回")
+ public JsonResult<Map<String, Object>> queryOrderList(@RequestBody QueryJhyOrderListDto model) {
+ Map<String, Object> result = jhyService.queryOrderList(model);
+ return JsonResult.success(result);
+ }
+
+
+}
--
Gitblit v1.9.1