From 6f37b29eb7d357db0667bdcd3588e23cab75f6ce Mon Sep 17 00:00:00 2001
From: "kuang.yifei@iwhalecloud.com" <kuang.yifei@iwhalecloud.com>
Date: Thu, 9 Jun 2022 14:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/order/OrderMasterController.java  | 10 ++++++----
 .../java/com/ghy/web/pojo/vo/OrderListResponse.java  |  2 +-
 .../main/java/com/ghy/web/pojo/vo/OrderStandard.java | 12 ++++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 624f50f3..bafec0b2 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -27,6 +27,7 @@ import com.ghy.payment.service.FinancialDetailService;
 import com.ghy.payment.service.FinancialMasterService;
 import com.ghy.web.pojo.vo.OrderDetailsResponseVo;
 import com.ghy.web.pojo.vo.OrderListResponse;
+import com.ghy.web.pojo.vo.OrderStandard;
 import com.ghy.worker.domain.Worker;
 import com.ghy.worker.service.WorkerService;
 import com.github.pagehelper.PageInfo;
@@ -95,7 +96,7 @@ public class OrderMasterController extends BaseController {
         list.forEach(master->{
             // 初始化属性
             OrderListResponse orderListResponse = new OrderListResponse();
-            List<Map<String, Integer>> standardList = new ArrayList<>();
+            List<OrderStandard> standardList = new ArrayList<>();
 
             // 师傅信息
             Worker worker = workerService.selectById(master.getWorkerId());
@@ -113,9 +114,10 @@ public class OrderMasterController extends BaseController {
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
 
             for(GoodsStandard goodsStandard : goodsStandardList){
-                Map<String, Integer> standardMap = new HashMap<>();
-                standardMap.put(goodsStandard.getGoodsStandardName(), goodsStandard.getGoodsNum());
-                standardList.add(standardMap);
+                OrderStandard orderStandard = new OrderStandard();
+                orderStandard.setStandardName(goodsStandard.getGoodsStandardName());
+                orderStandard.setStandardNum(goodsStandard.getGoodsNum());
+                standardList.add(orderStandard);
             }
 
             // 编辑返回属性
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index cc90be2c..d2f08a3a 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -33,5 +33,5 @@ public class OrderListResponse {
 
     private String address;
 
-    private List<Map<String, Integer>> standardList;
+    private List<OrderStandard> standardList;
 }
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java
new file mode 100644
index 00000000..5afee7a4
--- /dev/null
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandard.java
@@ -0,0 +1,12 @@
+package com.ghy.web.pojo.vo;
+
+import lombok.Data;
+
+@Data
+public class OrderStandard {
+
+    private String standardName;
+
+    private Integer standardNum;
+
+}