From 9860dd8d6a437ba7e11168f490f86d4cc6edf584 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 13 六月 2024 22:34:47 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
index f579148..dd319b6 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeVirtualCardMapper.xml
@@ -11,11 +11,12 @@
<result column="last_operate" jdbcType="TINYINT" property="lastOperate" />
<result column="last_operate_time" jdbcType="TIMESTAMP" property="lastOperateTime" />
<result column="in_use" jdbcType="TINYINT" property="inUse" />
+ <result column="intake_id" jdbcType="BIGINT" property="intakeId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, vc_num, client_id, money, last_operate, last_operate_time, in_use, create_time
+ id, vc_num, client_id, money, last_operate, last_operate_time, in_use, intake_id, create_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -33,10 +34,10 @@
<!--@mbg.generated-->
insert into se_virtual_card (id, vc_num, client_id,
money, last_operate, last_operate_time,
- in_use, create_time)
+ in_use, intake_id, create_time)
values (#{id,jdbcType=BIGINT}, #{vcNum,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT},
#{money,jdbcType=FLOAT}, #{lastOperate,jdbcType=TINYINT}, #{lastOperateTime,jdbcType=TIMESTAMP},
- #{inUse,jdbcType=TINYINT}, #{createTime,jdbcType=TIMESTAMP})
+ #{inUse,jdbcType=TINYINT}, #{intakeId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeVirtualCard">
<!--@mbg.generated-->
@@ -63,6 +64,9 @@
<if test="inUse != null">
in_use,
</if>
+ <if test="intakeId != null">
+ intake_id,
+ </if>
<if test="createTime != null">
create_time,
</if>
@@ -88,6 +92,9 @@
</if>
<if test="inUse != null">
#{inUse,jdbcType=TINYINT},
+ </if>
+ <if test="intakeId != null">
+ #{intakeId,jdbcType=BIGINT},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
@@ -116,6 +123,9 @@
<if test="inUse != null">
in_use = #{inUse,jdbcType=TINYINT},
</if>
+ <if test="intakeId != null">
+ intake_id = #{intakeId,jdbcType=BIGINT},
+ </if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
@@ -131,10 +141,16 @@
last_operate = #{lastOperate,jdbcType=TINYINT},
last_operate_time = #{lastOperateTime,jdbcType=TIMESTAMP},
in_use = #{inUse,jdbcType=TINYINT},
+ intake_id = #{intakeId,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
-
+ <update id="updateVcCardNoUseStateByIntakeId" parameterType="java.lang.Long">
+ update se_virtual_card
+ set in_use = 0,
+ intake_id = null
+ where intake_id = #{intakeId,jdbcType=BIGINT}
+ </update>
<!--楠岃瘉鍐滄埛鏄惁鎷ユ湁鎸囧畾鍚嶇О鐨勮櫄鎷熷崱-->
<select id="getRecordCountByName" resultType="java.lang.Integer">
SELECT COUNT(*) AS recordCount
@@ -145,7 +161,7 @@
</if>
<if test = "vcName != null and vcName !=''">
- AND vc_name = #{vcName}
+ AND vc_num = #{vcName}
</if>
</where>
</select>
@@ -185,6 +201,13 @@
WHERE id = #{vcId}
</select>
+ <!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱-->
+ <select id="getVcCardByNum" resultType="com.dy.pipIrrGlobal.pojoSe.SeVirtualCard">
+ select
+ <include refid="Base_Column_List" />
+ FROM se_virtual_card WHERE vc_num = #{vcNum}
+ </select>
+
<!--鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID-->
<select id="getVcIdByNum" resultType="java.lang.Long">
SELECT id FROM se_virtual_card WHERE vc_num = #{vcNum}
@@ -198,4 +221,5 @@
ORDER BY vc_num desc
LIMIT 0,1
</select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0