From 7bce3a96c4a1a61a2c299be033c3fb798648ad78 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 十月 2024 15:05:49 +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/VoTradeDetails.java |  119 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
index 559f77e..9a85b2a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java
@@ -5,9 +5,10 @@
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
 import com.dy.common.po.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -21,67 +22,151 @@
  */
 
 @Data
-@JsonPropertyOrder({ "cashierId", "villageId", "clientNum", "districtTitle", "clientName", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "paymentName", "tradeTime"})
+@JsonPropertyOrder({"orderNumber", "clientName", "cardNum", "idCard", "clientNum", "phone", "operateType", "tradeAmount", "waterCost", "cardCost", "gift", "refundAmount", "money", "paymentName", "tradeTime", "cashierId", "cashierName", "cardState", "districtTitle", "villageId"})
 @HeadRowHeight(30)
 @ContentRowHeight(20)
 public class VoTradeDetails implements BaseEntity {
     private static final long serialVersionUID = 202402012040001L;
 
-    @Schema(title = "鏀堕摱鍛業D")
-    @ExcelIgnore
-    private String cashierId;
+    /**
+     * 璁㈠崟鍙�
+     */
+    @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
+    @ColumnWidth(25)
+    private String orderNumber;
 
-    @Schema(title = "鏉戝簞ID")
-    @ExcelIgnore
-    private String villageId;
-
-    @Schema(title = "鍐滄埛缂栧彿")
-    @ExcelIgnore
-    private String clientNum;
-
-    @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
-    @ColumnWidth(20)
-    private String districtTitle;
-
+    /**
+     * 鍐滄埛濮撳悕
+     */
     @ExcelProperty(value = {"${title}", "鍐滄埛濮撳悕"})
     @ColumnWidth(15)
     private String clientName;
 
+    /**
+     * 姘村崱缂栧彿
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+    @ColumnWidth(20)
+    private String cardNum;
+
+    /**
+     * 韬唤璇佸彿
+     */
+    @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
+    @ColumnWidth(15)
+    private String idCard;
+
+    /**
+     * 鍐滄埛缂栧彿
+     */
+    @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
+    @ColumnWidth(15)
+    private String clientNum;
+
+    /**
+     * 鑱旂郴鐢佃瘽
+     */
     @ExcelProperty(value = {"${title}", "鑱旂郴鐢佃瘽"})
     @ColumnWidth(15)
     private String phone;
 
+    /**
+     * 涓氬姟绫诲瀷
+     */
     @ExcelProperty(value = {"${title}", "涓氬姟绫诲瀷"})
     @ColumnWidth(15)
     private String operateType;
 
+    /**
+     * 浜ゆ槗閲戦
+     */
     @ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
     @ColumnWidth(15)
     private Double tradeAmount;
 
+    /**
+     * 璐按閲戦
+     */
     @ExcelProperty(value = {"${title}", "璐按閲戦"})
     @ColumnWidth(15)
     private Double waterCost;
 
+    /**
+     * 璐崱閲戦
+     */
     @ExcelProperty(value = {"${title}", "璐崱閲戦"})
     @ColumnWidth(15)
     private Double cardCost;
 
+    /**
+     * 璧犻�侀噾棰�
+     */
     @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
     @ColumnWidth(15)
     private Double gift;
 
+    /**
+     * 杩旇繕閲戦
+     */
     @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
     @ColumnWidth(15)
     private Double refundAmount;
 
+    /**
+     * 浣欓
+     */
+    @ExcelProperty(value = {"${title}", "浣欓"})
+    @ColumnWidth(15)
+    private Double money;
+
+    /**
+     * 浠樻鏂瑰紡
+     */
     @ExcelProperty(value = {"${title}", "浠樻鏂瑰紡"})
     @ColumnWidth(15)
     private String paymentName;
 
+    /**
+     * 浜ゆ槗鏃堕棿
+     */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ExcelProperty(value = {"${title}", "浜ゆ槗鏃堕棿"})
     @ColumnWidth(20)
     private Date tradeTime;
 
+    /**
+     * 鏀堕摱鍛業D
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelIgnore
+    private Long cashierId;
+
+    /**
+     * 鏀堕摱鍛樺鍚�
+     */
+    @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
+    @ColumnWidth(15)
+    private String cashierName;
+
+    /**
+     * 鍗＄墖鐘舵��
+     */
+    @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
+    @ColumnWidth(15)
+    private String cardState;
+
+    /**
+     * 鏉戝簞鍚嶇О
+     */
+    @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
+    @ColumnWidth(35)
+    private String districtTitle;
+
+    /**
+     * 鏉戝簞ID
+     */
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelIgnore
+    private Long villageId;
 }

--
Gitblit v1.8.0