From bc958e6f7341714e40da74722c4f2208f192fe61 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 21 十月 2024 16:21:50 +0800
Subject: [PATCH] 2024-10-21 朱宝民 虚拟卡销卡接口、获取虚拟卡充值记录接口

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java |   66 +++++++++++++++++++-------------
 1 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
index 0e9c043..9f955ca 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoVcRecharge.java
@@ -1,8 +1,12 @@
 package com.dy.pipIrrGlobal.voSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.dy.common.po.BaseEntity;
-import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -13,39 +17,47 @@
  * @Description
  */
 @Data
+@JsonPropertyOrder({"vcId", "clientId", "rechargeTime", "rechargeAmount", "afterRecharge", "rechargeType"})
 public class VoVcRecharge implements BaseEntity {
+    private static final long serialVersionUID = 202410211420001L;
 
-    @Schema(title = "鍏呭�糏D")
-    private Long id;
-
-    @Schema(description = "铏氭嫙鍗D")
+    /**
+     * 铏氭嫙鍗D
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     private Long vcId;
 
-    @Schema(description = "鍐滄埛ID")
+    /**
+     * 鍐滄埛ID
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
     private Long clientId;
 
-
-    @Schema(description = "閽卞寘浣欓")
-    private Double money;
-
-    @Schema(description = "鍏呭�煎悗浣欓")
-    private Double afterRecharge;
-
-    @Schema(description = "璁㈠崟鍙�")
-    private String orderNumber;
-
-    @Schema(description = "鍏呭�奸噾棰�")
-    private Integer rechargeAmount;
-
-    @Schema(description = "涓嬪崟鏃堕棿")
-    private Date orderTime;
-
-    @Schema(description = "鍏呭�煎畬鎴愭椂闂�")
+    /**
+     * 鍏呭�煎畬鎴愭椂闂�
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date rechargeTime;
 
-    @Schema(description = "璁㈠崟鐘舵��")
-    private Byte orderState;
+    /**
+     * 鍏呭�奸噾棰�
+     */
+    private Integer rechargeAmount;
 
-    @Schema(description = "璁㈠崟鐘舵��")
-    private String orderStateName;
+    /**
+     * 鍏呭�煎悗浣欓
+     */
+    private Double afterRecharge;
+
+    /**
+     * 鍏呭�肩被鍨�
+     */
+    private String rechargeType;
+
+    /**
+     * 铏氭嫙鍗$姸鎬侊紝鏆傛椂涓嶇敤锛岀洿鎺ヨ繃婊ゆ帀宸叉敞閿�铏氭嫙鍗�
+     */
+    //private String cardState;
+
 }

--
Gitblit v1.8.0