From 487bed3eba27a1f6621c43b7fab5c82468fa2bc9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:26:44 +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 |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 d65d5c7..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;
@@ -31,6 +32,7 @@
     /**
      * 璁㈠崟鍙�
      */
+    @ExcelProperty(value = {"${title}", "璁㈠崟鍙�"})
     @ColumnWidth(25)
     private String orderNumber;
 
@@ -45,19 +47,21 @@
      * 姘村崱缂栧彿
      */
     @JSONField(serializeUsing= ObjectWriterImplToString.class)
-    @ColumnWidth(15)
-    private Long cardNum;
+    @ExcelProperty(value = {"${title}", "姘村崱缂栧彿"})
+    @ColumnWidth(20)
+    private String cardNum;
 
     /**
      * 韬唤璇佸彿
      */
+    @ExcelProperty(value = {"${title}", "韬唤璇佸彿"})
     @ColumnWidth(15)
     private String idCard;
 
     /**
      * 鍐滄埛缂栧彿
      */
-    //@ExcelIgnore
+    @ExcelProperty(value = {"${title}", "鍐滄埛缂栧彿"})
     @ColumnWidth(15)
     private String clientNum;
 
@@ -80,6 +84,7 @@
      */
     @ExcelProperty(value = {"${title}", "浜ゆ槗閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double tradeAmount;
 
     /**
@@ -87,6 +92,7 @@
      */
     @ExcelProperty(value = {"${title}", "璐按閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double waterCost;
 
     /**
@@ -94,6 +100,7 @@
      */
     @ExcelProperty(value = {"${title}", "璐崱閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double cardCost;
 
     /**
@@ -101,6 +108,7 @@
      */
     @ExcelProperty(value = {"${title}", "璧犻�侀噾棰�"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double gift;
 
     /**
@@ -108,14 +116,16 @@
      */
     @ExcelProperty(value = {"${title}", "杩旇繕閲戦"})
     @ColumnWidth(15)
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
     private Double refundAmount;
 
     /**
      * 浣欓
      */
-    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @ExcelProperty(value = {"${title}", "浣欓"})
     @ColumnWidth(15)
-    private Long money;
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double money;
 
     /**
      * 浠樻鏂瑰紡
@@ -142,12 +152,14 @@
     /**
      * 鏀堕摱鍛樺鍚�
      */
+    @ExcelProperty(value = {"${title}", "鏀堕摱鍛樺鍚�"})
     @ColumnWidth(15)
     private String cashierName;
 
     /**
      * 鍗＄墖鐘舵��
      */
+    @ExcelProperty(value = {"${title}", "鍗＄墖鐘舵��"})
     @ColumnWidth(15)
     private String cardState;
 
@@ -155,7 +167,7 @@
      * 鏉戝簞鍚嶇О
      */
     @ExcelProperty(value = {"${title}", "鏉戝簞鍚嶇О"})
-    @ColumnWidth(20)
+    @ColumnWidth(35)
     private String districtTitle;
 
     /**

--
Gitblit v1.8.0