From b8ed54ed4d7b467cb3cac44d670cdba69fe368e3 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Tue, 5 Dec 2023 10:26:55 +0800
Subject: [PATCH] fix

---
 .../core/domain/order/vo/OrderInfoVo.java     |  5 +++++
 .../order/controller/OrderInfoController.java | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
index b0bc7e3..d1dd756 100644
--- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
+++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
@@ -1,7 +1,12 @@
 package com.bonus.zlpt.common.core.domain.order.vo;
 
 import com.bonus.zlpt.common.core.domain.order.OrderInfo;
+import lombok.Data;
+import lombok.ToString;
 
+
+@Data
+@ToString
 public class OrderInfoVo extends OrderInfo {
     /* 装备类别 grandpa */
     private String typeName;
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
index 9f58484..05f82e6 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
@@ -1,6 +1,7 @@
 package com.bonus.zlpt.order.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
@@ -23,6 +24,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.bonus.zlpt.common.core.domain.order.OrderInfo;
 import com.bonus.zlpt.order.service.IOrderInfoService;
+
+import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
+
 /**
  * 订单信息Controller
  * 
@@ -47,6 +51,21 @@ public class OrderInfoController extends BaseController
     {
         startPage();
         List<OrderInfoVo> list = orderInfoService.selectOrderInfoList(orderInfo);
+        for (OrderInfoVo orderInfoVo : list) {
+            Map map1 = (Map) equipClient.getInfo(orderInfoVo.getMaId());
+            if (map1 != null) {
+                Map map2 = (Map) map1.get(DATA_TAG);
+                if (map2 != null) {
+                    String typeName = (String) map2.get("typeName");
+                    String groupName = (String) map2.get("groupName");
+                    String modelName = (String) map2.get("modelName");
+                    String deviceName = (String) map2.get("deviceName");
+                    orderInfoVo.setTypeName(typeName);
+                    orderInfoVo.setGroupName(groupName);
+                    orderInfoVo.setDeviceName(modelName + deviceName);
+                }
+            }
+        }
         return getDataTable(list);
     }