From ab5014ba38544e79dd21b3abf83e4f7d84d4ecb7 Mon Sep 17 00:00:00 2001
From: xyiege <xc@xyiege.com>
Date: Mon, 18 Jul 2022 00:20:44 +0800
Subject: [PATCH] =?UTF-8?q?json=20=E8=AF=B7=E6=B1=82=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/controller/admin/AdminOrderController.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
index 507f8ff..b9a5a73 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import sun.net.httpserver.HttpsServerImpl;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -96,16 +97,19 @@ public class AdminOrderController extends BaseController {
 
     /**
      * 订单信息
-     * @param batchcode
+     * @param request
      * @return
      */
     @PostMapping("/orderInfo")
-    public JSONObject orderInfo(String batchcode){
+    public JSONObject orderInfo(@RequestBody String request){
+        // 请求来的字符串进行处理
+        JSONObject jsonreq=JSONObject.parseObject(request);
+        String batchcode = jsonreq.getString("batchcode");
         //罗列出订单信息，及其参数
         List retlist = orderService.orderInfo(batchcode);
-
+        Map mp= orderService.orderDetail(batchcode);
         jsonObject.put("code",200);
-        jsonObject.put("data",retlist);
+        jsonObject.put("data",mp);
         jsonObject.put("msg","成功");
         return jsonObject;
     }