From 6eab5ecc0a1cf8bcf1ee999457104e2281e767d2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十二月 2023 15:57:40 +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 | 135 +++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 65 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 7ebcb09..00fe845 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="cardId" jdbcType="BIGINT" property="cardid" />
- <result column="clientId" jdbcType="BIGINT" property="clientid" />
+ <result column="cardNum" jdbcType="VARCHAR" property="cardnum" />
+ <result column="clientNum" jdbcType="VARCHAR" property="clientnum" />
<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, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks,
+ id, cardNum, clientNum, money, amount, gift, afterRecharge, paymentId, price, remarks,
`operator`, operateDt
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -35,44 +35,29 @@
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
+<!-- <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, cardId, clientId, money, amount, gift, afterRecharge, paymentId, price, remarks, `operator`, operateDt)
- 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 into se_recharge (id, cardNum, clientNum, money,
+ amount, gift, afterRecharge,
+ paymentId, price, remarks,
+ `operator`, operateDt)
+ values (#{id,jdbcType=BIGINT} ,#{cardnum,jdbcType=VARCHAR}, #{clientnum,jdbcType=VARCHAR}, #{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="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">-->
-<!-- <!–@mbg.generated–>-->
-<!-- insert into se_recharge (cardId, clientId, money, -->
-<!-- amount, gift, afterRecharge, -->
-<!-- paymentId, price, remarks, -->
-<!-- `operator`, operateDt)-->
-<!-- values (#{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="cardid != null">
- cardId,
+ <if test="cardnum != null">
+ cardNum,
</if>
- <if test="clientid != null">
- clientId,
+ <if test="clientnum != null">
+ clientNum,
</if>
<if test="money != null">
money,
@@ -103,11 +88,11 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="cardid != null">
- #{cardid,jdbcType=BIGINT},
+ <if test="cardnum != null">
+ #{cardnum,jdbcType=VARCHAR},
</if>
- <if test="clientid != null">
- #{clientid,jdbcType=BIGINT},
+ <if test="clientnum != null">
+ #{clientnum,jdbcType=VARCHAR},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -142,11 +127,11 @@
<!--@mbg.generated-->
update se_recharge
<set>
- <if test="cardid != null">
- cardId = #{cardid,jdbcType=BIGINT},
+ <if test="cardnum != null">
+ cardNum = #{cardnum,jdbcType=VARCHAR},
</if>
- <if test="clientid != null">
- clientId = #{clientid,jdbcType=BIGINT},
+ <if test="clientnum != null">
+ clientNum = #{clientnum,jdbcType=VARCHAR},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -181,8 +166,8 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@mbg.generated-->
update se_recharge
- set cardId = #{cardid,jdbcType=BIGINT},
- clientId = #{clientid,jdbcType=BIGINT},
+ set cardNum = #{cardnum,jdbcType=VARCHAR},
+ clientNum = #{clientnum,jdbcType=VARCHAR},
money = #{money,jdbcType=FLOAT},
amount = #{amount,jdbcType=FLOAT},
gift = #{gift,jdbcType=FLOAT},
@@ -196,25 +181,35 @@
</update>
<!--鏍规嵁姘村崱缂栧彿鍒犻櫎鍏呭�艰褰�-->
- <delete id="deleteByCardId" parameterType="java.lang.Long">
- DELETE FROM se_recharge WHERE cardId = ${cardId}
+ <delete id="deleteByCardNum" parameterType="java.lang.String">
+ DELETE FROM se_recharge WHERE cardNum = #{cardNum}
</delete>
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
select
- COUNT(*) AS recordCount
+ COUNT(*) AS recordCount
FROM se_recharge_history rec
- INNER JOIN se_client_card card ON rec.cardId = card.id
- INNER JOIN ba_client cli ON rec.clientId = cli.id
+ 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
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
- <if test = "cardAddr != null and cardAddr !=''">
- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+ <!-- <if test = "clientId != null and clientId > 0">-->
+ <!-- AND rec.clientId like CONCAT('%',#{clientId},'%')-->
+ <!-- </if>-->
+ <if test = "clientNum != null and clientNum > 0">
+ AND rec.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <!-- <if test = "cardAddr != null and cardAddr !=''">-->
+ <!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
+ <!-- </if>-->
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
<if test = "paymentId != null and paymentId > 0">
@@ -230,27 +225,37 @@
<!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栧厖鍊艰褰�-->
<select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
SELECT
- (@i:=@i+1) AS id,
- cli.name AS clientName,
- rec.clientId,
- card.cardAddr,
- rec.amount,
- rec.afterRecharge,
- rec.paymentId,
- rec.price,
- (SELECT `name` FROM ba_user WHERE id = rec.operator) AS operator,
- rec.operateDt
+ (@i:=@i+1) AS id,
+ cli.name AS clientName,
+ cli.num AS clientNum,
+ card.cardNum,
+ rec.amount,
+ rec.afterRecharge,
+ rec.paymentId,
+ rec.price,
+ (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.cardId = card.id
- INNER JOIN ba_client cli ON rec.clientId = cli.id
- , (SELECT @i:=0) AS itable
+ 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
<where>
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
- <if test = "cardAddr != null and cardAddr !=''">
- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
+<!-- <if test = "clientId != null and clientId > 0">-->
+<!-- AND rec.clientId like CONCAT('%',#{clientId},'%')-->
+<!-- </if>-->
+ <if test = "clientNum != null and clientNum > 0">
+ AND rec.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+<!-- <if test = "cardAddr != null and cardAddr !=''">-->
+<!-- AND card.cardAddr like CONCAT('%',#{cardAddr},'%')-->
+<!-- </if>-->
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
<if test = "paymentId != null and paymentId > 0">
@@ -261,7 +266,7 @@
AND rec.operateDt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}
</if>
</where>
-
+ ORDER BY rec.operateDt DESC
<if test="pageCurr != null and pageSize != null">
LIMIT ${pageCurr}, ${pageSize}
</if>
--
Gitblit v1.8.0