From 38d6b6134defd6e3f388d41148696a71972612e7 Mon Sep 17 00:00:00 2001
From: xyiege <xyiege@gmail.com>
Date: Wed, 20 Jul 2022 00:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=9B=86=E5=90=88=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/controller/admin/AdminOrderController.java      | 4 ++--
 src/main/java/cn/chjyj/szwh/service/OrderService.java    | 2 +-
 .../cn/chjyj/szwh/service/impl/OrderServiceImpl.java     | 9 ++++++---
 3 files changed, 9 insertions(+), 6 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 f537be9..c96af64 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
@@ -67,10 +67,10 @@ public class AdminOrderController extends BaseController {
         JSONObject json = JSONObject.parseObject(request);
         String batchcode = json.getString("batchcode");
         // 订单详情
-        Map orderMap = orderService.orderDetail(batchcode);
+        List orderDetailList = orderService.orderDetail(batchcode);
         jsonObject.put("code",200);
         jsonObject.put("msg","成功");
-        jsonObject.put("data",orderMap);
+        jsonObject.put("data",orderDetailList);
         return jsonObject;
     }
 
diff --git a/src/main/java/cn/chjyj/szwh/service/OrderService.java b/src/main/java/cn/chjyj/szwh/service/OrderService.java
index 74dc75c..db80cae 100644
--- a/src/main/java/cn/chjyj/szwh/service/OrderService.java
+++ b/src/main/java/cn/chjyj/szwh/service/OrderService.java
@@ -28,7 +28,7 @@ public interface OrderService {
      * @param batchcode
      * @return
      */
-    Map<String,Object> orderDetail(String batchcode);
+    List orderDetail(String batchcode);
 
     /**
      * 根据编号查询订单信息
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
index 95b11e7..e385d18 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -138,8 +138,8 @@ public class OrderServiceImpl implements OrderService {
      * @return
      */
     @Override
-    public Map<String, Object> orderDetail(String batchcode) {
-        Map retmap =new HashMap();
+    public List orderDetail(String batchcode) {
+        List retList = new ArrayList();
         // 订单详情及产品信息
         List<OrderDetailVo> ordvList =orderGoodsDetailMapper.getOrderDetailVo(batchcode);
         if(ordvList==null){
@@ -148,6 +148,7 @@ public class OrderServiceImpl implements OrderService {
         }else{
             // 枚举所有的订单详情
             for(OrderDetailVo dv:ordvList){
+                Map retmap = new HashMap();
                 // 商品图片
                 if(StringUtils.isNotBlank(dv.getGoods_image())){
                     //todo 远程获取图
@@ -204,10 +205,12 @@ public class OrderServiceImpl implements OrderService {
                 }
                 retmap.put("gather_arr",gatherList);
                 retmap.put("oneSource",oneSource);
+                //
+                retList.add(retmap);
             }
         }
 
-        return retmap;
+        return retList;
     }
 
     @Override