From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 138bd76..7b57e40 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -44,9 +44,9 @@
VALUES (
#{id},
#{createBy},
- now(),
+ #{createTime},
#{updateBy},
- now(),
+ #{updateTime},
#{flowNo},
#{orderId},
#{flowContent},
@@ -60,8 +60,16 @@
#{companyId}
)
</insert>
+ <update id="updateTimeByOrderId">
+ UPDATE sys_order_flow set
+ 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 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}
@@ -125,8 +133,11 @@
<if test="record.shopId != null and record.shopId != ''">
and a.shop_id=#{record.shopId}
</if>
-
</where>
+ <if test="record.sort !=null">
+ order by
+ a.${record.sort} ${record.order}
+ </if>
<if test="record.offset >=0 and record.limit >0">
limit
#{record.offset},#{record.limit}
@@ -176,4 +187,8 @@
</where>
</select>
+ <select id="selectOrderFlowByType" resultMap="SysOrderFlowMap">
+ select * from sys_order_flow where flow_type='退款'
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1