From 222c8c6e1826b476163fbdd670fad6b7f577665b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 15 十二月 2023 18:03:22 +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 | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 76d7882..c67c845 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeRechargeMapper.xml
@@ -34,17 +34,36 @@
delete from se_recharge
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge" useGeneratedKeys="true">
+
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeRecharge">
<!--@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 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>
+
+<!-- <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
@@ -230,6 +249,10 @@
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
+ <if test = "clientId != null and clientId > 0">
+ AND rec.clientId like CONCAT('%',#{clientId},'%')
+ </if>
+
<if test = "cardAddr != null and cardAddr !=''">
AND card.cardAddr like CONCAT('%',#{cardAddr},'%')
</if>
@@ -242,7 +265,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