From 0d2927a2cae09fb140f0d2c2374348e8de43f256 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Fri, 8 Dec 2023 15:19:39 +0800
Subject: [PATCH] fix

---
 .../common/core/domain/order/vo/OrderInfoVo.java | 16 +++++++++++++++-
 .../order/controller/OrderInfoController.java    |  7 +++++++
 .../main/resources/mapper/OrderInfoMapper.xml    |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

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 b74cbb5..75ec4a2 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
@@ -19,6 +19,18 @@ public class OrderInfoVo extends OrderInfo {
     /* 装备名称 child */
     @ApiModelProperty(value = "装备名称")
     private String deviceName;
+    @ApiModelProperty(value = "装备编码")
+    private String deviceCode;
+    @ApiModelProperty(value = "装备图片")
+    private String devicePicUrl;
+    @ApiModelProperty(value = "装备品牌")
+    private String deviceBrand;
+    @ApiModelProperty(value = "装备规格")
+    private String deviceSpecification;
+    @ApiModelProperty(value = "装备位置")
+    private String deviceLocation;
+    @ApiModelProperty(value = "装备月租金")
+    private String deviceMonthLeasePrice;
     @ApiModelProperty(value = "装备id")
     private Long maId;
     @ApiModelProperty(value = "联系电话")
@@ -53,7 +65,7 @@ public class OrderInfoVo extends OrderInfo {
     private String orderContract;
     @ApiModelProperty(value = "机手姓名")
     private String machinistName;
-    @ApiModelProperty(value = "联系电话")
+    @ApiModelProperty(value = "机手联系电话")
     private String phone;
     @ApiModelProperty(value = "物流司机电话")
     private String logisticsPhone;
@@ -68,4 +80,6 @@ public class OrderInfoVo extends OrderInfo {
     /* 合同附件 */
     @ApiModelProperty(value = "合同附件")
     private String contractUrl;
+    @ApiModelProperty(value = "订单状态文字")
+    private String orderStatusStr;
 }
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 134644a..ffaaad7 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
@@ -112,6 +112,13 @@ public class OrderInfoController extends BaseController
                 orderInfo.setTypeName(typeName);
                 orderInfo.setGroupName(groupName);
                 orderInfo.setDeviceName(modelName + deviceName);
+                //装备编号，图片，品牌，规格，位置addressId，月租金
+                orderInfo.setDeviceCode((String) map2.get("code"));
+                orderInfo.setDevicePicUrl((String) map2.get("picUrl"));
+                orderInfo.setDeviceBrand((String) map2.get("brand"));
+                orderInfo.setDeviceSpecification((String) map2.get("specification"));
+                orderInfo.setDeviceLocation((String) map2.get("location"));
+                orderInfo.setDeviceMonthLeasePrice((String) map2.get("monthLeasePrice"));
             }
         }
         return success(orderInfo);
diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
index 48499fc..1dac890 100644
--- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
+++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
-        select d.*,o.code,o.time as order_time,o.order_status
+        select d.*,o.code,o.time,o.order_status
         from ma_order_info o
         left join ma_order_details d on d.order_id = o.order_id
         where o.order_id = #{orderId}