From c80fa36ef5e9cfc48a368939e61c9e89a6b5ecc8 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 13 Jun 2022 16:29:24 +0800
Subject: [PATCH] fix:排除删除会员方法
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
index 5d544e3..55817bf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -16,6 +16,7 @@
<result property="vipId" column="vip_id" />
<result property="payMethod" column="pay_method" />
<result property="cardId" column="card_id" />
+ <result property="cardName" column="card_name" />
<result property="isGift" column="is_gift" />
<result property="orderNo" column="order_no" />
@@ -65,10 +66,14 @@
create_time=#{payTime}
where order_id=#{orderId}
</update>
+ <delete id="deleteByOrderId">
+ delete from sys_order_flow where order_id=#{orderId}
+ </delete>
<select id="selectByOrderId" resultMap="SysOrderFlowMap">
- select a.*, b.order_no from sys_order_flow a
+ select a.*, b.order_no,c.card_name from sys_order_flow a
left join sys_order b on a.order_id=b.id
+ left join money_card_use c on a.card_id=c.id
where order_id=#{orderId}
</select>
@@ -94,12 +99,15 @@
a.pay_method as payMethod,
a.flow_no as flowNo,
d.shop_short_name as shopName,
+ f.card_name as cardName,
e.su_name as staffName
from sys_order_flow a
LEFT JOIN sys_order b on a.order_id=b.ID
LEFT JOIN sys_vip_info c on a.vip_id=c.ID
LEFT JOIN sys_shop_info d on a.shop_id=d.ID
LEFT JOIN sys_users e on e.su_id=b.STAFF_ID
+ left join money_card_use f on a.card_id=f.id
+
<where>
and a.company_id=#{record.companyId}
--
Gitblit v1.9.1