From 955ec151b467016c24235e28b9ea09d324db7139 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 24 九月 2024 14:26:02 +0800
Subject: [PATCH] 2024-09-24 朱宝民 修改付款方式

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java |   86 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
index fad9f78..502bd8a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
@@ -1,7 +1,8 @@
 package com.dy.pipIrrGlobal.voSe;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -15,62 +16,103 @@
  */
 
 @Data
-@Schema(title = "鏀舵嵁瑙嗗浘瀵硅薄")
 public class VoReceipt {
     private static final long serialVersionUID = 202402011037001L;
 
-    @Schema(title = "鏀堕摱鍛業D")
+    /**
+     * 鏀堕摱鍛業D
+     */
     private String cashierId;
 
-    @Schema(title = "璁㈠崟鍙�")
-    private String orderNumber;
+    /**
+     * 璁㈠崟鍙�
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long orderNumber;
 
-    @Schema(title = "闀囧悕绉�")
+    /**
+     * 闀囧悕绉�
+     */
     private String townName;
 
-    @Schema(title = "鏉戝悕绉�")
+    /**
+     * 鏉戝悕绉�
+     */
     private String villageName;
 
-    @Schema(title = "鍐滄埛濮撳悕")
+    /**
+     * 鍐滄埛濮撳悕
+     */
     private String name;
 
-    @Schema(title = "鐢佃瘽")
+    /**
+     * 鐢佃瘽
+     */
     private String phone;
 
-    @Schema(title = "鍐滄埛缂栧彿")
-    private String clientNum;
+    /**
+     * 鍐滄埛缂栧彿
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long clientNum;
 
-    @Schema(title = "姘村崱缂栧彿")
-    private String cardNum;
+    /**
+     * 姘村崱缂栧彿
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    private Long cardNum;
 
-    @Schema(title = "涓氬姟绫诲瀷")
+    /**
+     * 涓氬姟绫诲瀷
+     */
     private String operateType;
 
-    @Schema(title = "璐按閲戦")
+    /**
+     * 璐按閲戦
+     */
     private Double waterCost;
 
-    @Schema(title = "璐崱閲戦")
+    /**
+     * 璧犻�侀噾棰�
+     */
+    private Double gift;
+
+    /**
+     * 璐崱閲戦
+     */
     private Double cardCost;
 
-    @Schema(title = "鏀惰垂閲戦")
+    /**
+     * 鏀惰垂閲戦
+     */
     private Double amount;
 
-    @Schema(title = "姘村崱浣欓")
+    /**
+     * 姘村崱浣欓
+     */
     private Double money;
 
-    @Schema(title = "鏀粯鏂瑰紡")
+    /**
+     * 鏀粯鏂瑰紡
+     */
     private String paymentName;
 
-    @Schema(title = "鎿嶄綔浜�")
+    /**
+     * 鎿嶄綔浜�
+     */
     private String operatorName;
 
+    /**
+     * 鎿嶄綔鏃堕棿
+     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Schema(title = "鎿嶄綔鏃堕棿")
     private Date operateTime;
 
+    /**
+     * 褰撳墠鏃堕棿
+     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @Schema(title = "褰撳墠鏃堕棿")
     private Date currentTime;
 }

--
Gitblit v1.8.0