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 | 39 +++++++++++--------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCommand.java | 41 ++++++++++++++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 10 ++++
3 files changed, 73 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCommand.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCommand.java
new file mode 100644
index 0000000..a06a613
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoCommand.java
@@ -0,0 +1,41 @@
+package com.dy.pipIrrGlobal.voSe;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ZhuBaoMin
+ * @date 2024-07-02 16:22
+ * @LastEditTime 2024-07-02 16:22
+ * @Description 鍛戒护鏃ュ織瑙嗗浘
+ */
+
+@Data
+public class VoCommand {
+ private static final long serialVersionUID = 1L;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long id;
+
+ private String commandName;
+
+ private String intakeName;
+
+ private String rtuAddr;
+
+ private String protocol;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date resultTime;
+
+ private String result;
+
+ private String userName;
+}
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 365a623..fdd0c57 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
@@ -26,8 +26,14 @@
@Schema(title = "鍐滄埛濮撳悕")
private String clientName;
+ private String phone;
+
+ private String idCard;
+
@Schema(title = "鍐滄埛缂栧彿")
private String clientNum;
+
+ private Float money;
@Schema(title = "姘村崱缂栧彿")
private String cardNum;
@@ -48,7 +54,9 @@
private Float price;
@Schema(title = "鎿嶄綔浜�")
- private String operator;
+ private String opr;
+
+ private String operateType;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
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 2930b70..6c6907e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeCardOperateMapper.xml
@@ -266,23 +266,30 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍏呭�艰褰�-->
<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 !=''">
--
Gitblit v1.8.0