From 82408e91875093048f1630f2e32ab2a0c7c7290d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 12 Apr 2021 21:39:16 +0800
Subject: [PATCH] 修复bug11

---
 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 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 a40157c..9a30f8e 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},
@@ -94,7 +98,7 @@
 			<if test="content != null and content !='' ">
 				content = #{content},
 			</if>
-			<if test="createTime != null and createTime !='' ">
+			<if test="createTime != null  ">
 				create_time = #{createTime},
 			</if>
 			<if test="vipId != null and vipId !='' ">
@@ -109,8 +113,8 @@
 			<if test="type != null and type !='' ">
 				type = #{type},
 			</if>
-			<if test="taotal != null and taotal !='' ">
-				taotal = #{taotal},
+			<if test="total != null and total !='' ">
+				total = #{total},
 			</if>
 			<if test="times != null and times !='' ">
 				times = #{times},
@@ -149,6 +153,7 @@
 		select
 		id,
 		order_no,
+		pay_no,
 		operation_id,
 		content,
 		create_time,
@@ -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