From ef7526aa13ad39ed177b4088066bd532b0a2ac07 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 26 十月 2023 11:25:50 +0800
Subject: [PATCH] # excel导出调整

---
 server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 379c34f..6482088 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -25,7 +25,7 @@
 public class Goodsorder {
 
     @ApiModelProperty(value = "缂栫爜")
-    @ExcelColumn(name="璁㈠崟缂栧彿",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="璁㈠崟缂栧彿",index = 2,width = 10,align = HorizontalAlignment.CENTER)
     private String id;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -61,7 +61,7 @@
     private String memberName;
 
     @ApiModelProperty(value = "浜ゆ槗閲戦")
-    @ExcelColumn(name="鎶奸噾锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="鎶奸噾锛堝厓锛�",index = 4,width = 10,align = HorizontalAlignment.CENTER)
     private BigDecimal money;
 
     @ApiModelProperty(value = "鐘舵�� 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�")
@@ -71,7 +71,7 @@
     private String preOrderid;
 
     @ApiModelProperty(value = "鍦ㄧ嚎浜ゆ槗鍗曞彿")
-    @ExcelColumn(name="浜ゆ槗鍗曞彿",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="浜ゆ槗鍗曞彿",index = 3,width = 10,align = HorizontalAlignment.CENTER)
     private String onlineOrderid;
     @ApiModelProperty(value = "鏀粯鐘舵�� 0寰呮敮浠� 1宸叉敮浠�")
     private Integer payStatus;
@@ -80,21 +80,21 @@
     private Integer payWay;
 
     @ApiModelProperty(value = "鏀粯鏃堕棿")
-    @ExcelColumn(name="浜ゆ娂閲戞椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="浜ゆ娂閲戞椂闂�",index = 5,width = 10,align = HorizontalAlignment.CENTER)
     private Date payDate;
 
     @ApiModelProperty(value = "浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾")
     private Integer type;
 
     @ApiModelProperty(value = "缁撶畻閲戦(鍒嗭級")
-    @ExcelColumn(name="缁撶畻閲戦",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="缁撶畻閲戦(鍏�)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
     private BigDecimal closeMoney;
 
     @ApiModelProperty(value = "缁撶畻閫�娆惧崟鍙�(鍏宠仈refund)")
     private String closeId;
 
     @ApiModelProperty(value = "缁撶畻鏃堕棿")
-//    @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="缁撶畻鏃堕棿",index = 8,width = 10,align = HorizontalAlignment.CENTER)
     private Date closeDate;
     @ApiModelProperty(value = "缁撶畻澶囨敞")
     private String closeInfo;
@@ -107,7 +107,9 @@
 
     @ApiModelProperty(value = "鐢ㄦ埛openid" )
     @TableField(exist = false)
+    @ExcelColumn(name="鐢ㄦ埛",index = 1 ,width = 10,align = HorizontalAlignment.CENTER)
     private String openid;
+
     @ApiModelProperty(value = "鏌ヨ寮�濮嬫棩鏈燂紙鍖呭惈锛�", example = "2023-10-01 15:12:01")
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -119,14 +121,15 @@
     @ApiModelProperty(value = "浜ゆ槗绗旀暟", example = "0")
     @TableField(exist = false)
     private int countNum;
+
     @ApiModelProperty(value = "閫�娆炬�婚(鍒嗭級")
     @TableField(exist = false)
-    @ExcelColumn(name="閫�娆炬�婚锛堝厓锛�",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="閫�鎶奸噾(鍏�)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
     private BigDecimal refundMoney;
 
     @ApiModelProperty(value = "鏈�鍚庨��娆炬椂闂�")
     @TableField(exist = false)
-    @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",width = 10,align = HorizontalAlignment.CENTER)
+    @ExcelColumn(name="閫�娆剧粨绠楁椂闂�",index = 9,width = 10,align = HorizontalAlignment.CENTER)
     private Date refundDate;
 
     @ApiModelProperty(value = "鏈�杩戦獞琛岀姸鎬�")

--
Gitblit v1.9.3