From 0ee340a21c1061cb68eb124ab26b482552634dba Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 23 十月 2024 20:23:22 +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 | 99 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 31 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 95468e4..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
@@ -22,44 +22,18 @@
*/
@Data
-@JsonPropertyOrder({"cardNum", "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;
/**
- * 姘村崱缂栧彿
+ * 璁㈠崟鍙�
*/
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- private Long cardNum;
-
- /**
- * 鏀堕摱鍛業D
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @ExcelIgnore
- private Long cashierId;
-
- /**
- * 鏉戝簞ID
- */
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- @ExcelIgnore
- private Long villageId;
-
- /**
- * 鍐滄埛缂栧彿
- */
- @ExcelIgnore
- private String clientNum;
-
- /**
- * 鏉戝簞鍚嶇О
- */
- @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
- @ColumnWidth(20)
- private String districtTitle;
+ @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
+ @ColumnWidth(25)
+ private String orderNumber;
/**
* 鍐滄埛濮撳悕
@@ -67,6 +41,28 @@
@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;
/**
* 鑱旂郴鐢佃瘽
@@ -118,6 +114,13 @@
private Double refundAmount;
/**
+ * 浣欓
+ */
+ @ExcelProperty(value = {"${title}", "浣欓"})
+ @ColumnWidth(15)
+ private Double money;
+
+ /**
* 浠樻鏂瑰紡
*/
@ExcelProperty(value = {"${title}", "浠樻鏂瑰紡"})
@@ -132,4 +135,38 @@
@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