From f2e8f0ae62eea8a81f035b67bc6c965a959b8e73 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 14 六月 2024 10:49:59 +0800
Subject: [PATCH] 修改 充值接口 返回充值ID作为订单号
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 130 +++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 59 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..3114482 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -359,64 +359,6 @@
</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>
-
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇寮�鍗¤褰曟暟閲�-->
<select id="getActiveCardRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
select
@@ -445,7 +387,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,
@@ -549,6 +491,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
--
Gitblit v1.8.0