From d2f5964f2286f45a3dd9a8b05d325b29d9a0a8ab Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 25 一月 2024 14:30:10 +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 | 72 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 5 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 4bf5062..b84d83e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -17,14 +17,15 @@
<result column="cancelDt" jdbcType="TIMESTAMP" property="canceldt" />
<result column="unlockDt" jdbcType="TIMESTAMP" property="unlockdt" />
<result column="reversalDt" jdbcType="TIMESTAMP" property="reversaldt" />
+ <result column="refundDt" jdbcType="TIMESTAMP" property="refunddt" />
<result column="consumeDt" jdbcType="TIMESTAMP" property="consumedt" />
<result column="lastOper" jdbcType="TINYINT" property="lastoper" />
<result column="remarks" jdbcType="VARCHAR" property="remarks" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt,
- lossDtDt, cancelDt, unlockDt, reversalDt, consumeDt, lastOper, remarks
+ id, cardAddr, cardNum, clientId, money, `state`, createDt, replaceDt, rechargeDt,
+ lossDtDt, cancelDt, unlockDt, reversalDt, refundDt, consumeDt, lastOper, remarks
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -76,14 +77,14 @@
insert into se_client_card (id, cardAddr, cardNum, clientId,
money, `state`, createDt,
replaceDt, rechargeDt, lossDtDt,
- cancelDt, unlockDt, reversalDt,
+ cancelDt, unlockDt, reversalDt, refundDt,
consumeDt, lastOper, remarks
)
values (#{id,jdbcType=BIGINT}, #{cardaddr,jdbcType=VARCHAR}, #{cardnum,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
#{money,jdbcType=FLOAT}, #{state,jdbcType=TINYINT}, #{createdt,jdbcType=TIMESTAMP},
#{replacedt,jdbcType=TIMESTAMP}, #{rechargedt,jdbcType=TIMESTAMP}, #{lossdtdt,jdbcType=TIMESTAMP},
- #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP},
- #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
+ #{canceldt,jdbcType=TIMESTAMP}, #{unlockdt,jdbcType=TIMESTAMP}, #{reversaldt,jdbcType=TIMESTAMP},
+ #{refunddt,jdbcType=TIMESTAMP}, #{consumedt,jdbcType=TIMESTAMP}, #{lastoper,jdbcType=TINYINT}, #{remarks,jdbcType=VARCHAR}
)
</insert>
@@ -126,6 +127,9 @@
</if>
<if test="reversaldt != null">
reversalDt,
+ </if>
+ <if test="refunddt != null">
+ refundDt,
</if>
<if test="consumedt != null">
consumeDt,
@@ -173,6 +177,9 @@
</if>
<if test="reversaldt != null">
#{reversaldt,jdbcType=TIMESTAMP},
+ </if>
+ <if test="refunddt != null">
+ #{refunddt,jdbcType=TIMESTAMP},
</if>
<if test="consumedt != null">
#{consumedt,jdbcType=TIMESTAMP},
@@ -225,6 +232,9 @@
<if test="reversaldt != null">
reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
</if>
+ <if test="refunddt != null">
+ refundDt = #{refunddt,jdbcType=TIMESTAMP},
+ </if>
<if test="consumedt != null">
consumeDt = #{consumedt,jdbcType=TIMESTAMP},
</if>
@@ -252,9 +262,61 @@
cancelDt = #{canceldt,jdbcType=TIMESTAMP},
unlockDt = #{unlockdt,jdbcType=TIMESTAMP},
reversalDt = #{reversaldt,jdbcType=TIMESTAMP},
+ refundDt = #{refunddt,jdbcType=TIMESTAMP},
consumeDt = #{consumedt,jdbcType=TIMESTAMP},
lastOper = #{lastoper,jdbcType=TINYINT},
remarks = #{remarks,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁鍐滄埛涓婚敭鑾峰彇姘村崱鍒楄〃-->
+ <select id="getCardInfoByClientId" resultType="com.dy.pipIrrGlobal.voSe.VoCardInfo">
+ SELECT
+ cardNum,
+ '鐢ㄦ埛鍗�' AS cardType,
+ money,
+ (CASE
+ WHEN state = 1 THEN "姝ｅ父"
+ WHEN state = 2 THEN "宸叉敞閿�"
+ ELSE "宸叉寕澶�"
+ END) AS state
+ FROM se_client_card
+ WHERE clientId = ${clientId}
+ </select>
+
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鎿嶄綔璁板綍鍒楄〃-->
+ <select id="getOperateRecordsByCardNum" resultType="java.util.HashMap">
+ SELECT * FROM v_operate WHERE cardNum = ${cardNum}
+ </select>
+
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇浣欓-->
+ <select id="getMoneyByCardNum" resultType="java.lang.Float">
+ SELECT money FROM se_client_card WHERE cardNum = ${cardNum}
+ </select>
+
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍏呭�兼�婚-->
+ <select id="sumRechargeByCardNum" resultType="java.lang.Float">
+ SELECT
+ SUM(his.amount) AS amount
+ FROM se_recharge_history his
+ INNER JOIN se_client_card card ON his.cardId = card.id
+ WHERE card.cardNum = ${cardNum}
+ </select>
+
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍗＄墖鐘舵�侊細1-寮�鍗★紝2-琛ュ崱锛�3-鍏呭�硷紝4-鎸傚け锛�5-娉ㄩ攢锛�6-瑙ｉ攣锛�7-鍐叉锛�8-娑堣垂-->
+ <select id="getCardStateByCardNum" resultType="java.lang.String">
+ SELECT
+ (CASE
+ WHEN lastOper = 1 THEN "寮�鍗�"
+ WHEN lastOper = 2 THEN "琛ュ崱"
+ WHEN lastOper = 3 THEN "鍏呭��"
+ WHEN lastOper = 4 THEN "鎸傚け"
+ WHEN lastOper = 5 THEN "娉ㄩ攢"
+ WHEN lastOper = 6 THEN "瑙ｉ攣"
+ WHEN lastOper = 7 THEN "鍐叉"
+ WHEN lastOper = 8 THEN "娑堣垂"
+ END) AS stateName
+ FROM se_client_card
+ WHERE cardNum = ${cardNum}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0