From a36a1f20875537b8f613035dc7def9d879e4a600 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 3 Dec 2024 18:53:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/material/order/OrderInfoMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b007a86..3daf2a4 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
@@ -168,7 +168,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} and bfi.task_type = 17 limit 1
+            hh.id = #{id} limit 1
     </select>
     <select id="getOrderDetailsById" resultType="com.bonus.material.order.domain.OrderInfoDto">
         SELECT

From 2ea021b9377173a0597b45df94184a529a21b0a9 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Tue, 3 Dec 2024 18:54:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/material/order/OrderInfoMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3daf2a4..88cea3c 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
@@ -237,7 +237,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} and bfi.task_type = 17
+            moi.order_id = #{orderId}
         GROUP BY hh.ma_id
     </select>
     <select id="getOrderDetailsByOrderId" resultType="com.bonus.material.order.domain.OrderDetailDto">