From d65cc4cd967d9c8cbdc8a4dd7c803e952f01098f Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 14:53:35 +0800
Subject: [PATCH] 修改用户登录接口 优化取水口绑定、解绑控制器接口
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 411 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 306 insertions(+), 105 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 039aa34..8c1b53c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -235,12 +235,12 @@
select
COUNT(*) AS recordCount
FROM se_card_operate ope
- INNER JOIN se_client_card card ON ope.card_id = card.id
- INNER JOIN se_client cli ON ope.client_id = cli.id
- INNER JOIN ba_user us ON ope.operator = us.id
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ 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>
@@ -253,38 +253,52 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
- <if test = "paymentId != null and paymentId > 0">
- AND ope.payment_id = ${paymentId}
- </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>
+ <!-- <if test = "rechargeTimeStart != null and rechargeTimeStop != null">-->
+ <!-- AND ope.operate_dt BETWEEN #{rechargeTimeStart} AND #{rechargeTimeStop}-->
+ <!-- </if>-->
</where>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�-->
<select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
SELECT
- CAST(ope.id AS char) AS id,
- cli.name AS clientName,
- cli.clientNum,
- CAST(card.cardNum AS char) AS cardNum,
- IFNULL(ope.trade_amount, 0) AS amount,
- IFNULL(ope.refund_amount, 0) AS refundAmount,
- (IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
- -- ope.payment_id AS paymentId,
- pay.name AS paymentName,
- ope.price,
- us.name AS operator,
- ope.operate_dt
+ ope.id AS opeId,
+ card.id AS cardId,
+ cli.name AS clientName,
+ cli.phone,
+ cli.idCard,
+ cli.clientNum,
+ cli.address,
+ card.money,
+ cardNum,
+<!-- CASE-->
+<!-- WHEN card.cardNum LIKE '10%' THEN CONCAT(SUBSTRING(card.cardNum, 7, 6),SUBSTRING(card.cardNum, 14, 4))-->
+<!-- ELSE card.cardNum-->
+<!-- END AS cardNum,-->
+ IFNULL(ope.card_cost,0) AS cardCost,
+ IFNULL(ope.trade_amount, 0) AS amount,
+ IFNULL(ope.refund_amount, 0) AS refundAmount,
+ (IFNULL(ope.money, 0) + IFNULL(ope.trade_amount, 0)) AS afterRecharge,
+ pay.name AS paymentName,
+ 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 '杩旇繕'
+ END) AS operateType,
+ ope.operate_dt
FROM se_card_operate ope
INNER JOIN se_client_card card ON ope.card_id = card.id
- INNER JOIN se_client cli ON ope.client_id = cli.id
- INNER JOIN ba_user us ON ope.operator = us.id
- Left JOIN se_payment_method pay ON ope.payment_id = pay.id
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ 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>
@@ -297,13 +311,13 @@
AND card.cardNum like CONCAT('%',#{cardNum},'%')
</if>
- <if test = "paymentId != null and paymentId > 0">
- AND ope.payment_id = ${paymentId}
- </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>
+<!-- <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 " >
@@ -320,7 +334,7 @@
FROM v_trade_details
<where>
<if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
+ AND villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
@@ -328,7 +342,7 @@
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND cashierId = #{cashierId}
</if>
<if test = "tradeTime != null">
@@ -342,7 +356,7 @@
SELECT * FROM v_trade_details
<where>
<if test = "villageId != null and villageId > 0">
- AND villageId = ${villageId}
+ AND villageId = #{villageId}
</if>
<if test = "operateTimeStart != null and operateTimeStop != null">
@@ -350,71 +364,13 @@
</if>
<if test = "cashierId != null and cashierId > 0">
- AND cashierId = ${cashierId}
+ AND cashierId = #{cashierId}
</if>
</where>
ORDER BY tradeTime
<if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
+ LIMIT #{pageCurr}, #{pageSize}
</if>
- </select>
-
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍鏁�-->
- <select id="getTransactionStatisticsRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
- SELECT
- COUNT(*) AS recordCount
- FROM v_transactionstatistics
- <where>
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeDate BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- </select>
-
- <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇浜ゆ槗缁熻璁板綍-->
- <select id="getTransactionStatistics" resultType="com.dy.pipIrrGlobal.voSe.VoTransactionStatistics">
- SELECT * FROM v_transactionstatistics
- <where>
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeDate BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- ORDER BY tradeDate
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
- </select>
-
- <!--鏍瑰熀鎸囧畾鏉′欢鑾峰彇绗旀暟鍚堣銆佸疄鏀堕噾棰濆悎璁°�佽禒閫侀噾棰濆悎璁�-->
- <select id="getTransactionStatisticsSums" resultType="java.util.Map">
- SELECT
- SUM(count) AS totalCount,
- SUM(received) AS totalReceived,
- SUM(gift) AS totalGift
- FROM v_transactionstatistics
- <where>
- <if test = "operateTimeStart != null and operateTimeStop != null">
- AND tradeDate BETWEEN #{operateTimeStart} AND #{operateTimeStop}
- </if>
- </where>
- </select>
-
- <!--鑾峰彇鎸囧畾鏃ユ湡銆佹寚瀹氭敮浠樻柟寮忓疄鏀堕噾棰濆悎璁�-->
- <select id="getPaymentSums" resultType="java.lang.Float">
- SELECT
- SUM(ope.trade_amount) AS tradeAmount
- FROM se_card_operate ope
- <where>
- <if test = "tradeDate != null and tradeDate !=''">
- AND Date(ope.operate_dt) = #{tradeDate}
- </if>
-
- <if test = "paymentId != null and paymentId >0">
- AND ope.payment_id = ${paymentId}
- </if>
- </where>
- GROUP BY ope.payment_id, Date(ope.operate_dt)
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟閲�-->
@@ -435,7 +391,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">
@@ -445,7 +401,7 @@
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰�-->
- <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCardNew">
+ <select id="getActiveCards" resultType="com.dy.pipIrrGlobal.voSe.VoActiveCard">
SELECT
CAST(ope.id AS char) AS id ,
cli.name AS clientName,
@@ -453,9 +409,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,
@@ -475,7 +431,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">
@@ -549,6 +505,76 @@
</trim>
</select>
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍鏁伴噺-->
+ <select id="getCommonOperationRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
+ select
+ COUNT(*) AS recordCount
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN ba_user us ON ope.operator = us.id
+ <where>
+ <if test = "operateType != null and operateType > 0">
+ AND ope.operate_type = #{operateType}
+ </if>
+
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+
+ <if test = "timeStart != null and timeStop != null">
+ AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇閫氱敤鎿嶄綔璁板綍-->
+ <select id="getCommonOperations" resultType="com.dy.pipIrrGlobal.voSe.VoOperate">
+ SELECT
+ cli.name AS clientName,
+ cli.clientNum,
+ CAST(card.cardNum AS char) AS cardNum,
+ us.name AS operator,
+ ope.operate_dt AS operateDt,
+ IFNULL(ope.trade_amount,0) AS refund,
+ (CASE
+ WHEN ope.payment_id = 1 THEN '鐜伴噾'
+ END) AS refundTypeName,
+ card.money,
+ IFNULL(ope.system_balance,0) AS systemBalance
+ FROM se_card_operate ope
+ INNER JOIN se_client cli ON ope.client_id = cli.id
+ INNER JOIN se_client_card card ON ope.card_id = card.id
+ INNER JOIN ba_user us ON ope.operator = us.id
+ <where>
+ <if test = "operateType != null and operateType > 0">
+ AND ope.operate_type = #{operateType}
+ </if>
+
+ <if test = "clientName != null and clientName !=''">
+ AND cli.name like CONCAT('%',#{clientName},'%')
+ </if>
+
+ <if test = "cardNum != null and cardNum !=''">
+ AND card.cardNum like CONCAT('%',#{cardNum},'%')
+ </if>
+
+ <if test = "timeStart != null and timeStop != null">
+ AND ope.operate_dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY ope.operate_dt 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="getReceiptsRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
@@ -563,7 +589,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 !=''">
@@ -608,7 +634,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 !=''">
@@ -641,7 +667,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 !=''">
@@ -653,4 +679,179 @@
</if>
</where>
</select>
+
+ <!--鏍规嵁姘村崱缂栧彿鑾峰彇鍏舵寕澶辨椂閫�娆鹃噾棰濓紙琛ュ崱鏃跺垽鏂娇鐢級-->
+ <select id="getTradeAmountByCardNo" resultType="java.lang.Double">
+ SELECT
+ ope.trade_amount AS tradeAmount
+ FROM se_client_card card
+ INNER JOIN se_card_operate ope ON ope.card_id = card.id
+ <where>
+ 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>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0