From fed1f885b03a5b4b7c62d44320c3ff2068ca02e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 03 Feb 2021 11:01:24 +0800
Subject: [PATCH] confict
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 12 ++++++++++--
1 files changed, 10 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 138bd76..5d544e3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -60,8 +60,13 @@
#{companyId}
)
</insert>
+ <update id="updateTimeByOrderId">
+ UPDATE sys_order_flow set
+ create_time=#{payTime}
+ where order_id=#{orderId}
+ </update>
- <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 +130,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}
--
Gitblit v1.9.1