租赁单价从类型树中获取

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 = "实时库存")

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'

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>