From 81eaf1aea588f309b35a51b836643a5b97f83e3d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 09 Apr 2021 17:48:21 +0800
Subject: [PATCH] 修复bug2
---
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
index a767566..0c36b69 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml
@@ -7,6 +7,7 @@
<resultMap type="com.matrix.system.hive.bean.MoneyCardUseFlow" id="MoneyCardUseFlowMap">
<id property="id" column="id" />
<result property="orderNo" column="order_no" />
+ <result property="payNo" column="pay_no" />
<result property="operationId" column="operation_id" />
<result property="content" column="content" />
<result property="createTime" column="create_time" />
@@ -31,6 +32,7 @@
<resultMap type="com.matrix.system.hive.bean.MoneyCardUseFlow" id="MoneyCardUseFlowSimpleMap">
<id property="id" column="id" />
<result property="orderNo" column="order_no" />
+ <result property="payNo" column="pay_no" />
<result property="operationId" column="operation_id" />
<result property="content" column="content" />
<result property="createTime" column="create_time" />
@@ -51,6 +53,7 @@
INSERT INTO money_card_use_flow (
id,
order_no,
+ pay_no,
operation_id,
content,
create_time,
@@ -66,6 +69,7 @@
VALUES (
#{id},
#{orderNo},
+ #{payNo},
#{operationId},
#{content},
#{createTime},
@@ -149,6 +153,7 @@
select
id,
order_no,
+ pay_no,
operation_id,
content,
create_time,
@@ -160,7 +165,7 @@
times,
gift_money,
balance,
- (SELECT STAFF_NAME from sys_shopstaff_info a WHERE operation_id=a.id) staffName,
+ (SELECT su_name from sys_users a WHERE operation_id=a.su_id) staffName,
(SELECT VIP_NAME FROM sys_vip_info b WHERE vip_id=b.ID) vipName,
(SELECT card_NAME FROM money_card_use c WHERE car_use_id=c.ID) cardName
from money_card_use_flow
@@ -171,6 +176,9 @@
</if>
<if test="record.orderNo != null and record.orderNo !='' ">
and order_no = #{record.orderNo}
+ </if>
+ <if test="record.payNo != null and record.payNo !='' ">
+ and pay_no = #{record.payNo}
</if>
<if test="record.operationId != null and record.operationId !='' ">
and operation_id = #{record.operationId}
@@ -215,6 +223,9 @@
<if test="record.orderNo != null and record.orderNo !='' ">
and order_no = #{record.orderNo}
</if>
+ <if test="record.payNo != null and record.payNo !='' ">
+ and pay_no = #{record.payNo}
+ </if>
<if test="record.operationId != null and record.operationId !='' ">
and operation_id = #{record.operationId}
</if>
@@ -245,6 +256,7 @@
select
id,
order_no,
+ pay_no,
operation_id,
content,
create_time,
@@ -269,6 +281,7 @@
select
id,
order_no,
+ pay_no,
operation_id,
content,
create_time,
@@ -292,6 +305,9 @@
<if test="record.orderNo != null and record.orderNo !='' ">
and order_no = #{record.orderNo}
</if>
+ <if test="record.payNo != null and record.payNo !='' ">
+ and pay_no = #{record.payNo}
+ </if>
<if test="record.operationId != null and record.operationId !='' ">
and operation_id = #{record.operationId}
</if>
--
Gitblit v1.9.1