From d919e26796ec5a6f78fc0b665840207f185f1274 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 二月 2024 15:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletRechargeMapper.xml | 155 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletRechargeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletRechargeMapper.xml
index 127bceb..149a21a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletRechargeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeWalletRechargeMapper.xml
@@ -5,17 +5,16 @@
<!--@mbg.generated-->
<!--@Table se_wallet_recharge-->
<id column="id" jdbcType="BIGINT" property="id" />
- <result column="walletId" jdbcType="BIGINT" property="walletid" />
- <result column="clientId" jdbcType="BIGINT" property="clientid" />
+ <result column="wallet_id" jdbcType="BIGINT" property="walletId" />
+ <result column="client_id" jdbcType="BIGINT" property="clientId" />
<result column="money" jdbcType="FLOAT" property="money" />
<result column="amount" jdbcType="FLOAT" property="amount" />
- <result column="afterRecharge" jdbcType="FLOAT" property="afterrecharge" />
- <result column="rechargeDt" jdbcType="TIMESTAMP" property="rechargedt" />
- <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+ <result column="after_recharge" jdbcType="FLOAT" property="afterRecharge" />
+ <result column="recharge_time" jdbcType="TIMESTAMP" property="rechargeTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, walletId, clientId, money, amount, afterRecharge, rechargeDt, remarks
+ id, wallet_id, client_id, money, amount, after_recharge, recharge_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -31,12 +30,12 @@
</delete>
<insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoSe.SeWalletRecharge">
<!--@mbg.generated-->
- insert into se_wallet_recharge (id, walletId, clientId,
- money, amount, afterRecharge,
- rechargeDt, remarks)
- values (#{id,jdbcType=BIGINT}, #{walletid,jdbcType=BIGINT}, #{clientid,jdbcType=BIGINT},
- #{money,jdbcType=FLOAT}, #{amount,jdbcType=FLOAT}, #{afterrecharge,jdbcType=FLOAT},
- #{rechargedt,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR})
+ insert into se_wallet_recharge (id, wallet_id, client_id,
+ money, amount, after_recharge,
+ recharge_time)
+ values (#{id,jdbcType=BIGINT}, #{walletId,jdbcType=BIGINT}, #{clientId,jdbcType=BIGINT},
+ #{money,jdbcType=FLOAT}, #{amount,jdbcType=FLOAT}, #{afterRecharge,jdbcType=FLOAT},
+ #{rechargeTime,jdbcType=TIMESTAMP})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoSe.SeWalletRecharge">
<!--@mbg.generated-->
@@ -45,11 +44,11 @@
<if test="id != null">
id,
</if>
- <if test="walletid != null">
- walletId,
+ <if test="walletId != null">
+ wallet_id,
</if>
- <if test="clientid != null">
- clientId,
+ <if test="clientId != null">
+ client_id,
</if>
<if test="money != null">
money,
@@ -57,25 +56,22 @@
<if test="amount != null">
amount,
</if>
- <if test="afterrecharge != null">
- afterRecharge,
+ <if test="afterRecharge != null">
+ after_recharge,
</if>
- <if test="rechargedt != null">
- rechargeDt,
- </if>
- <if test="remarks != null">
- remarks,
+ <if test="rechargeTime != null">
+ recharge_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
- <if test="walletid != null">
- #{walletid,jdbcType=BIGINT},
+ <if test="walletId != null">
+ #{walletId,jdbcType=BIGINT},
</if>
- <if test="clientid != null">
- #{clientid,jdbcType=BIGINT},
+ <if test="clientId != null">
+ #{clientId,jdbcType=BIGINT},
</if>
<if test="money != null">
#{money,jdbcType=FLOAT},
@@ -83,14 +79,11 @@
<if test="amount != null">
#{amount,jdbcType=FLOAT},
</if>
- <if test="afterrecharge != null">
- #{afterrecharge,jdbcType=FLOAT},
+ <if test="afterRecharge != null">
+ #{afterRecharge,jdbcType=FLOAT},
</if>
- <if test="rechargedt != null">
- #{rechargedt,jdbcType=TIMESTAMP},
- </if>
- <if test="remarks != null">
- #{remarks,jdbcType=VARCHAR},
+ <if test="rechargeTime != null">
+ #{rechargeTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
@@ -98,11 +91,11 @@
<!--@mbg.generated-->
update se_wallet_recharge
<set>
- <if test="walletid != null">
- walletId = #{walletid,jdbcType=BIGINT},
+ <if test="walletId != null">
+ wallet_id = #{walletId,jdbcType=BIGINT},
</if>
- <if test="clientid != null">
- clientId = #{clientid,jdbcType=BIGINT},
+ <if test="clientId != null">
+ client_id = #{clientId,jdbcType=BIGINT},
</if>
<if test="money != null">
money = #{money,jdbcType=FLOAT},
@@ -110,14 +103,11 @@
<if test="amount != null">
amount = #{amount,jdbcType=FLOAT},
</if>
- <if test="afterrecharge != null">
- afterRecharge = #{afterrecharge,jdbcType=FLOAT},
+ <if test="afterRecharge != null">
+ after_recharge = #{afterRecharge,jdbcType=FLOAT},
</if>
- <if test="rechargedt != null">
- rechargeDt = #{rechargedt,jdbcType=TIMESTAMP},
- </if>
- <if test="remarks != null">
- remarks = #{remarks,jdbcType=VARCHAR},
+ <if test="rechargeTime != null">
+ recharge_time = #{rechargeTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -125,13 +115,78 @@
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoSe.SeWalletRecharge">
<!--@mbg.generated-->
update se_wallet_recharge
- set walletId = #{walletid,jdbcType=BIGINT},
- clientId = #{clientid,jdbcType=BIGINT},
+ set wallet_id = #{walletId,jdbcType=BIGINT},
+ client_id = #{clientId,jdbcType=BIGINT},
money = #{money,jdbcType=FLOAT},
amount = #{amount,jdbcType=FLOAT},
- afterRecharge = #{afterrecharge,jdbcType=FLOAT},
- rechargeDt = #{rechargedt,jdbcType=TIMESTAMP},
- remarks = #{remarks,jdbcType=VARCHAR}
+ after_recharge = #{afterRecharge,jdbcType=FLOAT},
+ recharge_time = #{rechargeTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰曟暟-->
+ <select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM se_wallet_recharge rec
+ INNER JOIN se_client cli ON rec.client_id = cli.id
+ <where>
+ <if test = "walletId != null and walletId > 0">
+ AND rec.wallet_id = ${walletId}
+ </if>
+
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "timeStart != null and timeStop != null">
+ AND rec.recharge_time BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢靛瓙閽卞寘鍏呭�艰褰�-->
+ <select id="getWalletRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoWalletRecharge">
+ SELECT
+ cli.`name`,
+ cli.clientNum,
+ cli.phone,
+ rec.amount,
+ rec.after_recharge AS afterRecharge,
+ rec.recharge_time AS rechargeTime
+ FROM se_wallet_recharge rec
+ INNER JOIN se_client cli ON rec.client_id = cli.id
+ <where>
+ <if test = "walletId != null and walletId > 0">
+ AND rec.wallet_id = ${walletId}
+ </if>
+
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "timeStart != null and timeStop != null">
+ AND rec.recharge_time BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY rec.recharge_time DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鑾峰彇鎸囧畾鏃ユ湡寰俊鏀舵鎬婚锛岃储鍔″璐﹀鏍搁〉浣跨敤-->
+ <select id="getRechargeSum" resultType="java.lang.Double">
+ SELECT
+ SUM(amount) AS tradeAmount
+ FROM se_wallet_recharge
+ <where>
+ <if test = "tradeDate != null and tradeDate !=''">
+ AND Date(recharge_time) = #{tradeDate}
+ </if>
+ </where>
+ GROUP BY Date(recharge_time)
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0