From c0ca4eaeaa5885952ec2a98c6bba7f56bbbd45d4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 七月 2024 16:51:05 +0800
Subject: [PATCH] 2024-07-02 朱宝民 获取充值记录接口增加:手机号、身份证号、余额

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml |   75 +++++++++++++++++++++++--------------
 1 files changed, 47 insertions(+), 28 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 3114482..6c6907e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -253,36 +253,43 @@
         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
+      CAST(ope.id AS char) AS id,
+      cli.name AS clientName,
+      cli.phone,
+      cli.idCard,
+      cli.clientNum,
+      card.money,
+      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 opr,
+      (CASE
+      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_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)
       <if test = "clientName != null and clientName !=''">
@@ -297,13 +304,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 " >
@@ -665,4 +672,16 @@
       </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>
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0