From 857d738b56e4801a07521cfde502bd5c0f2bf132 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十二月 2023 11:41:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
index 74c067d..362da0b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -5,8 +5,8 @@
<!--@mbg.generated-->
<!--@Table se_recharge-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
- <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
+ <result column="cardId" jdbcType="BIGINT" property="cardid" />
+ <result column="clientId" jdbcType="BIGINT" property="clientid" />
<result column="money" jdbcType="FLOAT" property="money" />
<result column="amount" jdbcType="FLOAT" property="amount" />
<result column="gift" jdbcType="FLOAT" property="gift" />
@@ -19,7 +19,7 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, cardNum, clientNum, money, amount, gift, afterRecharge, paymentId, price, remarks,
+ id, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks,
`operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -35,29 +35,27 @@
where id = #{id,jdbcType=BIGINT}
</delete>
-<!-- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">-->
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
- insert into se_recharge (id, cardNum, clientNum, money,
+ insert into se_recharge (id, cardId, clientId, money,
amount, gift, afterRecharge,
paymentId, price, remarks,
`operator`, operateDt)
- values (#{id,jdbcType=BIGINT} ,#{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{money,jdbcType=FLOAT},
+ values (#{id,jdbcType=BIGINT}, #{cardid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT}, #{money,jdbcType=FLOAT},
#{amount,jdbcType=FLOAT}, #{gift,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT},
#{paymentid,jdbcType=BIGINT}, #{price,jdbcType=FLOAT}, #{remarks,jdbcType=VARCHAR},
#{operator,jdbcType=BIGINT}, #{operatedt,jdbcType=TIMESTAMP})
</insert>
-
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into se_recharge
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- cardNum,
+ <if test="cardid != null">
+ cardId,
</if>
- <if test="clientnum != null">
- clientNum,
+ <if test="clientid != null">
+ clientId,
</if>
<if test="money != null">
money,
@@ -88,11 +86,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardnum != null">
- #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -127,11 +125,11 @@
<!--@mbg.generated-->
update se_recharge
<set>
- <if test="cardnum != null">
- cardNum = #{cardnum,jdbcType=VARCHAR},
+ <if test="cardid != null">
+ cardId = #{cardid,jdbcType=BIGINT},
</if>
- <if test="clientnum != null">
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ <if test="clientid != null">
+ clientId = #{clientid,jdbcType=BIGINT},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -166,8 +164,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
update se_recharge
- set cardNum = #{cardnum,jdbcType=VARCHAR},
- clientNum = #{clientnum,jdbcType=VARCHAR},
+ set cardId = #{cardid,jdbcType=BIGINT},
+ clientId = #{clientid,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
amount = #{amount,jdbcType=FLOAT},
gift = #{gift,jdbcType=FLOAT},
@@ -181,8 +179,13 @@
</update>
<!--鏍规嵁姘村崱缂栧彿鍒犻櫎鍏呭�艰褰�-->
- <delete id="deleteByCardNum" parameterType="java.lang.String">
- DELETE FROM se_recharge WHERE cardNum = #{cardNum}
+<!-- <delete id="deleteByCardNum" parameterType="java.lang.String">-->
+<!-- DELETE FROM se_recharge WHERE cardNum = #{cardNum}-->
+<!-- </delete>-->
+
+ <!--鏍规嵁姘村崱ID鍒犻櫎鍏呭�艰褰�-->
+ <delete id="deleteByCardId" parameterType="java.lang.Long">
+ DELETE FROM se_recharge WHERE cardId = #{cardId}
</delete>
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
@@ -190,16 +193,16 @@
select
COUNT(*) AS recordCount
FROM se_recharge_history rec
- INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
- INNER JOIN ba_client cli ON rec.clientNum = cli.num
- , (SELECT @i:=0) AS itable
+ INNER JOIN se_client_card card ON rec.cardId = card.id
+ INNER JOIN se_client cli ON rec.clientId = cli.id
+ , (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
<if test = "clientNum != null and clientNum > 0">
- AND rec.clientNum like CONCAT('%',#{clientNum},'%')
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
<if test = "cardNum != null and cardNum !=''">
@@ -221,7 +224,7 @@
SELECT
(@i:=@i+1) AS id,
cli.name AS clientName,
- cli.num AS clientNum,
+ cli.clientNum,
card.cardNum,
rec.amount,
rec.afterRecharge,
@@ -230,8 +233,8 @@
(SELECT `name` FROM ba_user WHERE id = rec.operator) AS operator,
rec.operateDt
FROM se_recharge_history rec
- INNER JOIN se_client_card card ON rec.cardNum = card.cardNum
- INNER JOIN ba_client cli ON rec.clientNum = cli.num
+ INNER JOIN se_client_card card ON rec.cardId = card.id
+ INNER JOIN se_client cli ON rec.clientId = cli.id
, (SELECT @i:=0) AS itable
<where>
<if test = "clientName != null and clientName !=''">
@@ -239,7 +242,7 @@
</if>
<if test = "clientNum != null and clientNum > 0">
- AND rec.clientNum like CONCAT('%',#{clientNum},'%')
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
</if>
<if test = "cardNum != null and cardNum !=''">
--
Gitblit v1.8.0