From af6a6f03d3da1303b6fec2cff5dbd0fd10e8ad5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:59:32 +0800
Subject: [PATCH] 1、查询产品bug 2、储值卡使用完成不设置为失效

---
 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 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 0a4e880..84fa609 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -17,6 +17,8 @@
         <result property="payMethod" column="pay_method" />
         <result property="cardId" column="card_id" />
         <result property="isGift" column="is_gift" />
+
+		<result property="orderNo" column="order_no" />
     </resultMap>
 
     <insert id="insert" parameterType="SysOrderFlow" useGeneratedKeys="true"
@@ -35,7 +37,9 @@
 		vip_id,
 		pay_method,
 		card_id,
-		is_gift
+		is_gift,
+		shop_id,
+		company_id
 		)
 		VALUES (
 		#{id},
@@ -51,7 +55,24 @@
 		#{vipId},
 		#{payMethod},
 		#{cardId},
-		#{isGift}
+		#{isGift},
+		#{shopId},
+		#{companyId}
 		)
 	</insert>
+
+	<select id="selectByOrderId" resultMap="SysOrderFlowMap">
+		select a.*, b.order_no from sys_order_flow a
+		left join sys_order b on a.order_id=b.id
+		where order_id=#{orderId}
+	</select>
+
+	<select id="selectPayMethodsAmountByOrderId" resultMap="SysOrderFlowMap">
+		select
+			pay_method,
+			sum(amount) amount
+		from sys_order_flow
+		where order_id=#{orderId}
+		group by pay_method
+	</select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1