From 5a94bafff399e0aa4a7962a47402888299de6684 Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Fri, 8 Dec 2023 17:27:22 +0800
Subject: [PATCH] fix

---
 .../zlpt/common/core/domain/order/vo/OrderInfoVo.java      | 2 +-
 .../zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml | 2 +-
 .../bonus/zlpt/order/controller/OrderInfoController.java   | 7 ++++++-
 3 files changed, 8 insertions(+), 3 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 75ec4a2..8b2242f 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
@@ -30,7 +30,7 @@ public class OrderInfoVo extends OrderInfo {
     @ApiModelProperty(value = "装备位置")
     private String deviceLocation;
     @ApiModelProperty(value = "装备月租金")
-    private String deviceMonthLeasePrice;
+    private Double deviceMonthLeasePrice;
     @ApiModelProperty(value = "装备id")
     private Long maId;
     @ApiModelProperty(value = "联系电话")
diff --git a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
index f8f7241..b7bd088 100644
--- a/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
+++ b/zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="maId != null "> and d.ma_id = #{maId}</if>
             <if test="code != null  and code != ''"> and d.code = #{code}</if>
-            <if test="typeId != null and level != null and level != '1'">
+            <if test="typeId != null and level != null and level != 1">
                 and d.type_id = #{typeId} or t.parent_id = #{typeId}
             </if>
             <if test="maStatus != null  and maStatus != ''"> and d.ma_status = #{maStatus}</if>
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 ffaaad7..62e1a06 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
@@ -118,7 +118,12 @@ public class OrderInfoController extends BaseController
                 orderInfo.setDeviceBrand((String) map2.get("brand"));
                 orderInfo.setDeviceSpecification((String) map2.get("specification"));
                 orderInfo.setDeviceLocation((String) map2.get("location"));
-                orderInfo.setDeviceMonthLeasePrice((String) map2.get("monthLeasePrice"));
+                try {
+                    Double price = (Double) map2.get("monthLeasePrice");
+                    orderInfo.setDeviceMonthLeasePrice(price);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
         return success(orderInfo);