From 7bf80c057f8e17fd37f1936e5b8dc1e1efad4bea Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 11 七月 2024 20:32:14 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index e3164a4..d828d9e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -5,6 +5,7 @@
<!--@mbg.generated-->
<!--@Table se_client_card-->
<id column="id" jdbcType="BIGINT" property="id" />
+ <result column="protocol" jdbcType="VARCHAR" property="protocol" />
<result column="cardAddr" jdbcType="VARCHAR" property="cardaddr" />
<result column="cardNum" jdbcType="BIGINT" property="cardnum" />
<result column="clientId" jdbcType="BIGINT" property="clientid" />
@@ -25,7 +26,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt,
+ id, protocol, cardAddr, cardNum, clientId, money, `state`, original_card_id, createDt, replaceDt, rechargeDt,
lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -53,35 +54,44 @@
<!--鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱琛ㄤ富閿強鍐滄埛缂栧彿-->
<select id="getCardIdAndClientNum" resultType="java.util.Map">
-<!-- SELECT id AS cardId, clientNum FROM se_client_card WHERE cardNum = #{cardNum}-->
+ <!-- SELECT id AS cardId, clientNum FROM se_client_card WHERE cardNum = #{cardNum}-->
SELECT
- card.id AS cardId,
- cli.clientNum,
- cli.id AS clientId
+ card.id AS cardId,
+ cli.clientNum,
+ cli.id AS clientId
FROM se_client_card card
- INNER JOIN se_client cli ON card.clientId = cli.id
+ INNER JOIN se_client cli ON card.clientId = cli.id
WHERE card.cardNum = #{cardNum}
</select>
+ <!-- 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱瀵瑰簲鐨勫啘鎴穒d鍜屽鍚� -->
+ <select id="getClientIdAndNameByCardAddrAndCardNo" resultType="java.util.Map">
+ SELECT
+ cli.id AS clientId,
+ cli.name AS clientName
+ FROM se_client_card card
+ INNER JOIN se_client cli ON card.clientId = cli.id
+ WHERE card.cardAddr = #{cardAddr} and card.cardNum = #{cardNum}
+ </select>
<!--鏍规嵁琛屾斂鍖哄垝涓叉ā绯婃煡璇㈡按鍗＄紪鍙�-->
<select id="getCardNumOfMax" resultType="java.lang.String">
SELECT cardNum
FROM se_client_card
- WHERE cardNum LIKE CONCAT('%',#{areaCode},'%')
+ WHERE cardNum LIKE CONCAT(#{areaCode},'%')
ORDER BY cardNum desc
LIMIT 0,1
</select>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard">
<!--@mbg.generated-->
- insert into se_client_card (id, cardAddr, cardNum, clientId,
+ insert into se_client_card (id, protocol, cardAddr, cardNum, clientId,
money, `state`, original_card_id, createDt,
replaceDt, rechargeDt, lossDtDt,
cancelDt, unlockDt, reversalDt, refundDt,
consumeDt, lastOper, remarks
)
- values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
+ values (#{id,jdbcType=BIGINT}, #{protocol,jdbcType=VARCHAR}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
#{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{originalCardId,jdbcType=BIGINT}, #{createdt,jdbcType=TIMESTAMP},
#{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP},
#{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP},
@@ -93,6 +103,9 @@
<!--@mbg.generated-->
insert into se_client_card
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="protocol != null">
+ protocol,
+ </if>
<if test="cardaddr != null">
cardAddr,
</if>
@@ -146,6 +159,9 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="protocol != null">
+ #{protocol,jdbcType=VARCHAR},
+ </if>
<if test="cardaddr != null">
#{cardaddr,jdbcType=VARCHAR},
</if>
@@ -203,6 +219,9 @@
<!--@mbg.generated-->
update se_client_card
<set>
+ <if test="protocol != null">
+ protocol = #{protocol,jdbcType=VARCHAR},
+ </if>
<if test="cardaddr != null">
cardAddr = #{cardaddr,jdbcType=VARCHAR},
</if>
@@ -260,7 +279,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeClientCard">
<!--@mbg.generated-->
update se_client_card
- set cardAddr = #{cardaddr,jdbcType=VARCHAR},
+ set protocol = #{protocol,jdbcType=VARCHAR}
+ cardAddr = #{cardaddr,jdbcType=VARCHAR},
cardNum = #{cardnum,jdbcType=BIGINT},
clientId = #{clientid,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
@@ -344,8 +364,9 @@
SELECT
COUNT(*) AS recordCount
FROM se_client_card card
- INNER JOIN se_client cli ON card.clientId = cli.id
+ INNER JOIN se_client cli ON card.clientId = cli.id
<where>
+ AND card.state = 1
<if test = "clientNum != null and clientNum !=''">
AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
@@ -365,20 +386,26 @@
SELECT
cli.clientNum,
cli.name AS clientName,
- card.cardNum,
+ cardNum,
+<!-- CASE-->
+<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!-- ELSE card.cardNum-->
+<!-- END AS cardNum,-->
cli.phone,
cli.idCard,
card.state AS cardState,
- (CASE
- WHEN card.state = 1 THEN '姝ｅ父'
- WHEN card.state = 2 THEN '宸叉敞閿�'
- WHEN card.state = 3 THEN '宸叉寕澶�'
- End) AS stateName,
+<!-- (CASE-->
+<!-- WHEN card.state = 1 THEN '姝ｅ父'-->
+<!-- WHEN card.state = 2 THEN '宸叉敞閿�'-->
+<!-- WHEN card.state = 3 THEN '宸叉寕澶�'-->
+<!-- End) AS stateName,-->
+ '姝ｅ父' AS stateName,
'鍐滄埛鍗�' AS cardType,
FORMAT(card.money, 2) AS money
FROM se_client_card card
INNER JOIN se_client cli ON card.clientId = cli.id
<where>
+ AND card.state = 1
<if test = "clientNum != null and clientNum !=''">
AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
@@ -413,20 +440,20 @@
SELECT
cli.clientNum,
cli.name AS clientName,
- card.cardNum,
+ cardNum,
+<!-- CASE-->
+<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!-- ELSE card.cardNum-->
+<!-- END AS cardNum,-->
cli.phone,
cli.idCard,
card.state AS cardState,
- (CASE
- WHEN card.state = 1 THEN '姝ｅ父'
- WHEN card.state = 2 THEN '宸叉敞閿�'
- WHEN card.state = 3 THEN '宸叉寕澶�'
- End) AS stateName,
+ '宸叉寕澶�' AS stateName,
'鍐滄埛鍗�' AS cardType,
FORMAT(card.money,2) AS money
FROM se_client_card card
INNER JOIN se_client cli ON card.clientId = cli.id
- WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.cardNum)
+ WHERE card.state = 3 AND NOT EXISTS (SELECT * FROM se_client_card card2 WHERE card2.original_card_id = card.id)
ORDER BY card.id
<trim prefix="limit " >
<if test="start != null and count != null">
--
Gitblit v1.8.0