From e213e39be2f626ce052abb5bd1582d48059177ba Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 03 Mar 2022 10:55:47 +0800
Subject: [PATCH] merge developer
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 955e108..eb2c3aa 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -15,6 +15,7 @@
<result property="activity" column="ACTIVITY"/>
<result property="total" column="TOTAL"/>
+
<result property="statu" column="STATU"/>
<result property="zkTotal" column="ZK_TOTAL"/>
<result property="shopId" column="SHOP_ID"/>
@@ -29,7 +30,8 @@
<result property="cardPay" column="card_Pay"/>
<result property="arrears" column="arrears"/>
<result property="payTime" column="pay_time"/>
-
+ <result property="cashierId" column="cashier_id"/>
+ <result property="cashierName" column="cashierName"/>
<!-- 扩展字段 -->
<result property="shopName" column="SHOP_NAME"/>
<result property="shopShortName" column="SHOP_SHORT_NAME"/>
@@ -64,7 +66,8 @@
pay_time,
company_id,
orderType,
- is_has_refund
+ is_has_refund,
+ cashier_id
)
VALUES (
#{id},
@@ -88,7 +91,8 @@
#{payTime},
#{companyId},
#{orderType},
- #{isHasRefund}
+ #{isHasRefund},
+ #{cashierId}
)
</insert>
@@ -151,7 +155,9 @@
<if test="isHasRefund != null ">
is_has_refund = #{isHasRefund},
</if>
-
+ <if test="cashierId != null ">
+ cashier_id = #{cashierId},
+ </if>
</set>
WHERE id=#{id}
</update>
@@ -174,11 +180,12 @@
<!-- 分页查询 -->
<select id="selectInPage" resultMap="SysOrderMap">
select
- a.*, b.VIP_NAME, c.su_name as STAFF_NAME,
+ a.*, b.VIP_NAME, c.su_name as STAFF_NAME, e.su_name as cashierName,
d.SHOP_NAME, b.PHONE
from sys_order a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left JOIN sys_users c on c.su_id=a.STAFF_ID
+ left JOIN sys_users e on e.su_id=a.cashier_id
left JOIN sys_shop_info d on d.ID=a.SHOP_ID
where 1=1
<if test="record!=null">
@@ -208,6 +215,9 @@
</if>
<if test="record.staffId != null and record.staffId !='' ">
and a.STAFF_ID = #{record.staffId}
+ </if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
</if>
<if test="record.isCross != null and record.isCross !='' ">
and a.IS_CROSS = #{record.isCross}
@@ -290,6 +300,9 @@
<if test="record.staffId != null and record.staffId !='' ">
and a.STAFF_ID = #{record.staffId}
</if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
+ </if>
<if test="(record.companyId!=null and record.companyId!='') ">
and a.company_id = #{record.companyId}
</if>
@@ -334,7 +347,7 @@
<select id="selectById" resultMap="SysOrderMap">
select
a.*,
- c.su_name as STAFF_NAME,
+ c.su_name as STAFF_NAME, e.su_name as cashierName,
d.SHOP_NAME,
d.shop_short_name,
b.PHONE,
@@ -342,6 +355,7 @@
from sys_order a
LEFT JOIN sys_vip_info b on b.ID=a.VIP_ID
left JOIN sys_users c on c.su_id=a.STAFF_ID
+ left JOIN sys_users e on e.su_id=a.cashier_id
left JOIN sys_shop_info d on d.ID=a.SHOP_ID
where a.id=#{id}
</select>
@@ -384,6 +398,9 @@
<if test="record.staffId != null and record.staffId !='' ">
and a.STAFF_ID = #{record.staffId}
+ </if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
</if>
<if test="record.isCross != null and record.isCross !='' ">
and a.IS_CROSS = #{record.isCross}
@@ -441,6 +458,9 @@
<if test="record.staffId != null and record.staffId !='' ">
and a.STAFF_ID = #{record.staffId}
</if>
+ <if test="record.cashierId != null and record.cashierId !='' ">
+ and a.cashier_id = #{record.cashierId}
+ </if>
<if test="record.isCross != null and record.isCross !='' ">
and a.IS_CROSS = #{record.isCross}
</if>
--
Gitblit v1.9.1