From 87f979fb201a82ebad5926735ed6dfa75ca004d3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 21 七月 2025 09:21:42 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
index 6f3cc68..924d890 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TbOrderMapper.xml
@@ -15,14 +15,14 @@
</resultMap>
<select id="getMyOrderList" resultType="com.ruoyi.system.vo.MyPushCompanyListVo">
- select t1.id orderId,t2.id,t2.company_name companyName,t2.create_time createTime,t2.sale_money saleMoney,t1.status
+ select t1.id orderId,t2.id,t2.company_name companyName,t2.create_time createTime,t2.sale_money saleMoney,t1.status,t1.cancel_type
from tb_order t1 left join tb_company t2 on t1.company_id = t2.id
- where t1.user_id =#{userId} and t2.id is not null
- <if test="query.status != null and query.status !=6 ">
+ where t1.user_id =#{userId} and t2.id is not null and t2.is_delete = 0 and t2.status != 2
+ <if test="query.status != null and query.status !=4 ">
and t1.status = #{query.status}
</if>
- <if test="query.status != null and query.status ==6 ">
- and t1.status in (5,6)
+ <if test="query.status != null and query.status ==4 ">
+ and t1.status in (4,5)
</if>
order by t1.create_time desc
</select>
--
Gitblit v1.7.1