feat:设备交易记录、商户交易记录导出

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java

@@ -13,13 +13,8 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-@HeadRowHeight(40)
-@ColumnWidth(50)
-@ContentRowHeight(20)
-@ExcelIgnoreUnannotated
 public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
 
-    @ExcelProperty("设备名称")
     @Schema(description = "设备id")
     private Long hardId;
 
@@ -29,7 +24,6 @@ public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
     @Schema(description = "设备类型")
     private String hardType;
 
-    @ExcelProperty("所属商户")
     @Schema(description = "商户名")
     private String merchantName;
 
@@ -39,11 +33,9 @@ public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
     @Schema(description = "商户id")
     private Long merchantId;
 
-    @ExcelProperty("总消费金额")
     @Schema(description = "总消费金额")
     private BigDecimal totalPayPrice;
 
-    @ExcelProperty("总消费次数")
     @Schema(description = "总消费次数")
     private BigDecimal totalPayCount;
 

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderSbVo.java

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.hard.api.vo.order;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
@@ -12,36 +13,30 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-@HeadRowHeight(40)
-@ColumnWidth(50)
-@ContentRowHeight(20)
-@ExcelIgnoreUnannotated
 public class HardOrderSbVo implements BaseMchInterface, BaseHardInterface {
 
     @Schema(description = "设备id")
     private Long hardId;
 
+    @Schema(description = "设备名称")
+    private String hardName;
+
+    @Schema(description = "设备类型")
+    private String hardType;
+
     @Schema(description = "商户id")
     private Long merchantId;
 
-    @Schema(description = "总消费金额")
+    @Schema(description = "商户名称")
+    private String merchantName;
+
+    @Schema(description = "商户logo")
+    private String logoPic;
+
+    @Schema(description = "总消费金额(元)")
     private BigDecimal totalPayPrice;
 
     @Schema(description = "总消费次数")
     private BigDecimal totalPayCount;
 
-    /**
-     * 商户相关
-     */
-    private String merchantName;
-
-    private String logoPic;
-
-    /**
-     * 设备相关
-     */
-    private String hardName;
-
-    private String hardType;
-
 }