From 6904205c711e55d23533a8d57c0b9bb75f47d1b6 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 05 十一月 2024 16:48:38 +0800
Subject: [PATCH] 优化代码

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoTradeDetails.java |  106 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 75 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..ef1acfa 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
@@ -8,6 +8,7 @@
 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 com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -22,44 +23,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 +42,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;
 
     /**
      * 鑱旂郴鐢佃瘽
@@ -87,6 +84,7 @@
      */
     @ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double tradeAmount;
 
     /**
@@ -94,6 +92,7 @@
      */
     @ExcelProperty(value = {"${title}", "璐按閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterCost;
 
     /**
@@ -101,6 +100,7 @@
      */
     @ExcelProperty(value = {"${title}", "璐崱閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double cardCost;
 
     /**
@@ -108,6 +108,7 @@
      */
     @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double gift;
 
     /**
@@ -115,7 +116,16 @@
      */
     @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double refundAmount;
+
+    /**
+     * 浣欓
+     */
+    @ExcelProperty(value = {"${title}", "浣欓"})
+    @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double money;
 
     /**
      * 浠樻鏂瑰紡
@@ -132,4 +142,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