From fbf006ebb7b755700ba6572d6b8bce11862ee7e3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 20 九月 2024 10:23:13 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoRecharge.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 e423945..3d9b309 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
@@ -1,5 +1,7 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,32 +22,62 @@
public class VoRecharge implements BaseEntity {
private static final long serialVersionUID = 1L;
- @Schema(title = "ID")
- private Long id;
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long opeId;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardId;
@Schema(title = "鍐滄埛濮撳悕")
private String clientName;
+ private String phone;
+
+ private String idCard;
+
@Schema(title = "鍐滄埛缂栧彿")
private String clientNum;
- @Schema(title = "姘村崱缂栧彿")
- private String cardNum;
+ private String address;
- @Schema(title = "鍏呭�奸噾棰�")
+ /**
+ * 姘村崱鏈�缁堜綑棰�
+ */
+ private Float money;
+
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardNum;
+
+ private Integer cardCost;
+
+ /**
+ * 鏈鍏呭�奸噾棰�
+ */
private Float amount;
- @Schema(title = "鍏呭�煎悗閲戦")
+ /**
+ * 鏈璧犻�侀噾棰�
+ */
+ private Float gift;
+
+ @Schema(title = "杩斿洖閲戦")
+ private Float refundAmount;
+
+ /**
+ * 鍏呭�煎悗閲戦锛屽厖鍊兼椂浣欓 + 鏈鍏呭�奸噾棰� + 鏈璧犻�侀噾棰�
+ */
private Float afterRecharge;
@Schema(title = "鏀粯鏂瑰紡")
- private Integer paymentId;
+ private String paymentName;
@Schema(title = "姘翠环")
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")
--
Gitblit v1.8.0