From 04aa44d5b89f705a9bcfc44d7dccc60f6b69f21d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 14:58:19 +0800
Subject: [PATCH] 2024-07-03 朱宝民 获取充值记录接口添加返回值
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml | 10 +++++++---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 6 ++++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
index e639cf5..1434dd0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java
@@ -48,8 +48,10 @@
*/
private Float money;
- @Schema(title = "姘村崱缂栧彿")
- private String cardNum;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardNum;
+
+ private Integer cardCost;
@Schema(title = "鍏呭�奸噾棰�")
private Float amount;
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 33c7923..19345e8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -266,7 +266,6 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�-->
<select id="getRecharges" resultType="com.dy.pipIrrGlobal.voSe.VoRecharge">
SELECT
-<!-- CAST(ope.id AS char) AS id,-->
ope.id AS opeId,
card.id AS cardId,
cli.name AS clientName,
@@ -275,11 +274,14 @@
cli.clientNum,
cli.address,
card.money,
- CAST(card.cardNum AS char) AS 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,
+ ope2.card_cost 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,
- -- ope.payment_id AS paymentId,
pay.name AS paymentName,
ope.price,
us.name AS opr,
@@ -292,9 +294,11 @@
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
+ INNER JOIN se_card_operate ope2 ON ope2.card_id = ope.card_id
Left JOIN se_payment_method pay ON ope.payment_id = pay.id
<where>
AND ope.operate_type in(2, 5)
+ AND ope2.operate_type = 1
<if test = "clientName != null and clientName !=''">
AND cli.name like CONCAT('%',#{clientName},'%')
</if>
--
Gitblit v1.8.0