From 25a7186138a2b076bcc71238a937da98b8e9a7fe Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 14 九月 2024 16:29:52 +0800
Subject: [PATCH] 2024-09-14 朱宝民 创建了一个新的获取充值记录接口，管理平台使用
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 339 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 296 insertions(+), 43 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
index 00047cf..376c5ab 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -240,7 +240,7 @@
INNER JOIN ba_user us ON ope.operator = us.id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
- AND ope.operate_type in(2, 5)
+ AND ope.operate_type in(1, 2, 5)
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
@@ -274,10 +274,7 @@
cli.clientNum,
cli.address,
card.money,
- CASE
- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))
- ELSE card.cardNum
- END AS cardNum,
+ cardNum,
IFNULL(ope.card_cost,0) AS cardCost,
IFNULL(ope.trade_amount, 0) AS amount,
IFNULL(ope.refund_amount, 0) AS refundAmount,
@@ -286,9 +283,9 @@
ope.price,
us.name AS opr,
(CASE
- WHEN ope.operate_type = 1 THEN "寮�鍗�"
- WHEN ope.operate_type = 2 THEN "鍏呭��"
- WHEN ope.operate_type = 5 THEN "杩旇繕"
+ WHEN ope.operate_type = 1 THEN '寮�鍗�'
+ WHEN ope.operate_type = 2 THEN '鍏呭��'
+ WHEN ope.operate_type = 5 THEN '杩旇繕'
END) AS operateType,
ope.operate_dt
FROM se_card_operate ope
@@ -309,14 +306,6 @@
<if test = "cardNum != null and cardNum !=''">
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
-
-<!-- <if test = "paymentId != null and paymentId > 0">-->
-<!-- AND ope.payment_id = ${paymentId}-->
-<!-- </if>-->
-
-<!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
-<!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
-<!-- </if>-->
</where>
ORDER BY ope.operate_dt DESC
<trim prefix="limit " >
@@ -330,46 +319,86 @@
<select id="getTransactionRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
- FROM v_trade_details
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON card.id = ope.card_id
+ LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN ba_user us ON ope.operator = us.id
<where>
+ AND ope.operate_type IN(1,2,3,5)
+
<if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
+ AND cli.villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
- </if>
-
- <if test = "tradeTime != null">
- AND tradeTime = #{tradeTime}
+ AND us.id = #{cashierId}
</if>
</where>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗璁板綍-->
<select id="getTransactions" resultType="com.dy.pipIrrGlobal.voSe.VoTradeDetails">
- SELECT * FROM v_trade_details
+ SELECT
+ ope.id AS orderNumber,
+ cli.name AS clientName,
+ card.cardNum AS cardNum,
+ cli.idCard,
+ cli.clientNum,
+ cli.phone,
+ (CASE ope.operate_type
+ WHEN 1 THEN '寮�鍗�'
+ WHEN 2 THEN '鍏呭��'
+ WHEN 3 THEN '閿�鍗�'
+ WHEN 5 THEN '琛ユ墸'
+ END) AS operateType,
+ (IFNULL(ope.trade_amount,0.00) + IFNULL(ope.card_cost,0.00)) AS tradeAmount,
+ IFNULL(ope.trade_amount,0.00) AS waterCost,
+ IFNULL(ope.card_cost,0.00) AS cardCost,
+ IFNULL(ope.gift,0.00) AS gift,
+ IFNULL(ope.refund_amount,0.00) AS refundAmount,
+ ope.money,
+ pay.name AS paymentName,
+ ope.operate_dt as tradeTime,
+ us.id AS cashierId,
+ us.name AS cashierName,
+ (CASE card.state
+ WHEN 1 THEN '姝ｅ父'
+ WHEN 2 THEN '宸叉敞閿�'
+ WHEN 3 THEN '宸叉寕澶�'
+ END) AS cardState,
+ cli.districtTitle,
+ cli.villageId AS villageId
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON card.id = ope.card_id
+ LEFT JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN ba_user us ON ope.operator = us.id
<where>
+ AND ope.operate_type IN(1,2,3,5)
+
<if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
+ AND cli.villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeTime BETWEEN #{operateTimeStart} AND #{operateTimeStop}
+ AND ope.operate_dt BETWEEN #{operateTimeStart} AND #{operateTimeStop}
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND us.id = #{cashierId}
</if>
</where>
- ORDER BY tradeTime
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ ORDER BY ope.operate_dt
+ <trim prefix="limit ">
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟閲�-->
@@ -390,7 +419,7 @@
</if>
<if test = "state != null and state > 0">
- AND card.state = ${state}
+ AND card.state = #{state}
</if>
<if test = "activeTimeStart != null and activeTimeStop != null">
@@ -408,9 +437,9 @@
card.cardNum AS cardNum,
card.state AS state,
(CASE
- WHEN card.state = 1 THEN "姝ｅ父"
- WHEN card.state = 2 THEN "宸叉敞閿�"
- WHEN card.state = 3 THEN "宸叉寕澶�"
+ WHEN card.state = 1 THEN '姝ｅ父'
+ WHEN card.state = 2 THEN '宸叉敞閿�'
+ WHEN card.state = 3 THEN '宸叉寕澶�'
END) AS stateName,
ope.card_cost AS cardCost,
ope.payment_id AS paymentId,
@@ -430,7 +459,7 @@
</if>
<if test = "state != null and state > 0">
- AND card.state = ${state}
+ AND card.state = #{state}
</if>
<if test = "activeTimeStart != null and activeTimeStop != null">
@@ -514,7 +543,7 @@
INNER JOIN ba_user us ON ope.operator = us.id
<where>
<if test = "operateType != null and operateType > 0">
- AND ope.operate_type = ${operateType}
+ AND ope.operate_type = #{operateType}
</if>
<if test = "clientName != null and clientName !=''">
@@ -541,7 +570,7 @@
ope.operate_dt AS operateDt,
IFNULL(ope.trade_amount,0) AS refund,
(CASE
- WHEN ope.payment_id = 1 THEN "鐜伴噾"
+ WHEN ope.payment_id = 1 THEN '鐜伴噾'
END) AS refundTypeName,
card.money,
IFNULL(ope.system_balance,0) AS systemBalance
@@ -551,7 +580,7 @@
INNER JOIN ba_user us ON ope.operator = us.id
<where>
<if test = "operateType != null and operateType > 0">
- AND ope.operate_type = ${operateType}
+ AND ope.operate_type = #{operateType}
</if>
<if test = "clientName != null and clientName !=''">
@@ -588,7 +617,7 @@
<where>
AND ope.operate_type IN(1,2)
<if test = "operateId != null and operateId > 0">
- AND ope.id = ${operateId}
+ AND ope.id = #{operateId}
</if>
<if test = "clientName != null and clientName !=''">
@@ -633,7 +662,7 @@
<where>
AND ope.operate_type IN(1,2)
<if test = "operateId != null and operateId > 0">
- AND ope.id = ${operateId}
+ AND ope.id = #{operateId}
</if>
<if test = "clientName != null and clientName !=''">
@@ -666,7 +695,7 @@
<where>
AND ope.operate_type IN(1,2)
<if test = "operateId != null and operateId > 0">
- AND ope.id = ${operateId}
+ AND ope.id = #{operateId}
</if>
<if test = "clientName != null and clientName !=''">
@@ -689,5 +718,229 @@
AND ope.operate_type = 6
AND card.cardNum = #{cardNum}
</where>
+ ORDER BY ope.operate_dt DESC
+ LIMIT 0,1
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴寮�鍗℃�绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getOpenCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 1
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鎸傚け鎬绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getLossCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 6
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鍏呭�兼�绘暟閲忥紙鐗╃悊鍗★級-->
+ <select id="getRechargeCountIcCardsCount" resultType="java.lang.Long">
+ SELECT
+ count(*)
+ FROM
+ `se_card_operate`
+ WHERE
+ operate_dt BETWEEN #{timeStart} AND #{timeStop} AND operate_type = 2
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴寮�鐗╃悊鍗″啘鎴锋暟閲�-->
+ <select id="getOpenIcCardClientsCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ (
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ COUNT(sc.id) AS openCardCount
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 1 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴寮�鐗╃悊鍗″啘鎴�-->
+ <select id="getOpenIcCardClients" resultType="com.dy.pipIrrGlobal.voSt.VoClientOpenCardCount">
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ COUNT(sc.id) AS openCardCount
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 1 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id
+ ORDER BY sc.id 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="getRechargeTotalClientsCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ (
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ IFNULL(SUM(sco.trade_amount),0) AS rechargeTotal
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 2 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴姣忎釜鍐滄埛鍏呭�煎悎璁�-->
+ <select id="getRechargeTotalClients" resultType="com.dy.pipIrrGlobal.voSt.VoClientRechargeTotal">
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ IFNULL(SUM(sco.trade_amount),0) AS rechargeTotal
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 2 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id
+ ORDER BY sc.id 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="getRechargeTotalGtValueClientsCount" resultType="java.lang.Long">
+ select
+ count(*)
+ from
+ (
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ IFNULL(SUM(sco.trade_amount),0) AS rechargeTotal
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 2 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id
+ HAVING IFNULL(SUM(sco.trade_amount),0) > #{value}) c
+ </select>
+ <!--鎸囧畾鏃堕棿娈靛唴鐗╃悊鍗″厖鍊奸噾棰濊秴杩囨寚瀹氬�肩殑鍐滄埛-->
+ <select id="getRechargeTotalGtValueClients" resultType="com.dy.pipIrrGlobal.voSt.VoClientRechargeTotal">
+ SELECT
+ sco.client_id AS clientId,
+ sc.`name` AS clientName,
+ sc.clientNum AS clientNum,
+ sc.address AS address,
+ sc.phone AS phone,
+ sc.idCard AS idCard,
+ IFNULL(SUM(sco.trade_amount),0) AS rechargeTotal
+ FROM
+ `se_card_operate` sco
+ INNER JOIN se_client sc ON sc.id = sco.client_id
+ WHERE
+ sco.operate_dt BETWEEN #{timeStart} AND #{timeStop} AND sco.operate_type = 2 AND sc.deleted = 0 AND sc.disabled = 0
+ GROUP BY sc.id
+ HAVING IFNULL(SUM(sco.trade_amount),0) > #{value}
+ ORDER BY sc.id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+ <!--鑾峰彇鍏呭�艰褰曟暟閲忥紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�-->
+ <select id="getRechargesCountNew" resultType="java.lang.Long">
+ SELECT COUNT(*) AS recordCount
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
+ LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
+ INNER JOIN ba_user us ON us.id = rch.operator
+ <where>
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ </select>
+
+ <!--鑾峰彇鍏呭�艰褰曪紝绠＄悊骞冲彴鍏呭�煎垪琛ㄤ娇鐢紝APP鏈娇鐢�-->
+ <select id="getRechargesNew" resultType="com.dy.pipIrrGlobal.voSe.VoRechargeNew">
+ SELECT
+ cli.name AS clientName,
+ cli.clientNum,
+ card.cardNum,
+ IFNULL(rch.amount, 0) AS amount,
+ IFNULL(rch.gift, 0) AS gift,
+ IFNULL(rch.afterRecharge, 0) AS afterRecharge,
+ pay.name AS paymentName,
+ us.name AS operator,
+ rch.operateDt AS operateTime
+ FROM se_client_card card
+ INNER JOIN se_client cli ON cli.id = card.clientId
+ LEFT JOIN se_recharge_history rch ON rch.cardId = card.id
+ LEFT JOIN se_payment_method pay ON pay.id = rch.paymentId
+ INNER JOIN ba_user us ON us.id = rch.operator
+ <where>
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "clientNum != null and clientNum > 0">
+ AND cli.clientNum like CONCAT('%',#{clientNum},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+ </where>
+ ORDER BY rch.operateDt DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0