From 3d62104bc73cfb53f1818e56fbf75b6a98486e36 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 3 Dec 2024 15:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=9F=E8=B5=81=E5=8D=95=E4=BB=B7=E4=BB=8E?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A0=91=E4=B8=AD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/common/biz/domain/TreeNode.java   | 3 +++
 .../main/resources/mapper/material/home/MaTypeInfoMapper.xml  | 2 +-
 .../main/resources/mapper/material/order/OrderInfoMapper.xml  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java
index db775e5..9d1e102 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/TreeNode.java
@@ -38,6 +38,9 @@ public class TreeNode {
     /** 原值 */
     @ApiModelProperty(value = "原值")
     private BigDecimal buyPrice;
+    /** 租赁单价 */
+    @ApiModelProperty(value = "租赁单价")
+    private BigDecimal leasePrice;
 
     /** 实时库存 */
     @ApiModelProperty(value = "实时库存")
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml
index 1c707b9..45ff00d 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/home/MaTypeInfoMapper.xml
@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="getMaTypeInfoList" resultType="com.bonus.common.biz.domain.TreeNode">
-        select type_id as id, parent_id as parentId, type_name as name, `level` as level, manage_type as manageType,
+        select type_id as id, parent_id as parentId, type_name as name, `level` as level, manage_type as manageType,lease_price as leasePrice,
                unit_name as unitName
         from ma_type
         where del_flag = '0'
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 2d39b0c..d6ea713 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -161,7 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left join ma_type mt ON mdi.type_id = mt.type_id
                 AND bfi.file_type = 0
         WHERE
-            hh.id = #{id} limit 1
+            hh.id = #{id} and bfi.task_type = 17 limit 1
     </select>
     <select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto">
         SELECT
@@ -230,7 +230,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN ma_type mt ON mdi.type_id = mt.type_id
                 AND bfi.file_type = 0
         WHERE
-            moi.order_id = #{orderId}
+            moi.order_id = #{orderId} and bfi.task_type = 17
         GROUP BY hh.ma_id
     </select>
 </mapper>
\ No newline at end of file