导出费用明细-代理商佣金

device-api/src/main/java/com/xy/dto/DeviceAlgorithmChargingHistoryDto.java

@@ -12,7 +12,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 /**
@@ -92,7 +91,7 @@ public class DeviceAlgorithmChargingHistoryDto {
     @Data
     @Accessors(chain = true)
     public static class PageExcelVo {
- 
+
 //        @ExcelProperty("说明")
 //        @ApiModelProperty(value = "备注")
 //        private String note;
@@ -122,8 +121,8 @@ public class DeviceAlgorithmChargingHistoryDto {
         @ApiModelProperty(value = "实缴金额")
         private Integer chargingMoney;
 
-        @ApiModelProperty(value = "代理商费用")
-        @ExcelProperty(value = "代理商费用", converter = CustomFenToYuanConverter.class)
+        @ApiModelProperty(value = "佣金")
+        @ExcelProperty(value = "佣金", converter = CustomFenToYuanConverter.class)
         @NumberFormat("#0.00")
         private Integer agentMoney;
 

device-api/src/main/java/com/xy/dto/DeviceChargingConfigDto.java

@@ -65,7 +65,7 @@ public class DeviceChargingConfigDto {
         @ApiModelProperty(value = "设备类型")
         private Integer deviceType;
 
-        @ApiModelProperty(value = "代理商费用;单位：分")
+        @ApiModelProperty(value = "佣金;单位：分")
         private Integer extraMoney;
 
     }

device-api/src/main/java/com/xy/dto/DeviceChargingHistoryDto.java

@@ -43,7 +43,7 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty(value = "续费金额")
         private Integer chargingMoney;
 
-        @ApiModelProperty(value = "代理商费用")
+        @ApiModelProperty(value = "佣金")
         private Integer agentMoney;
 
         @ApiModelProperty(value = "续费数量")
@@ -99,8 +99,8 @@ public class DeviceChargingHistoryDto {
         @NumberFormat("#0.00")
         @ApiModelProperty(value = "续费金额")
         private Integer chargingMoney;
-        @ApiModelProperty(value = "代理商费用")
-        @ExcelProperty(value = "代理商费用", converter = CustomFenToYuanConverter.class)
+        @ApiModelProperty(value = "佣金")
+        @ExcelProperty(value = "佣金", converter = CustomFenToYuanConverter.class)
         @NumberFormat("#0.00")
         private Integer agentMoney;
         @ExcelProperty("续费数量(年)")
@@ -114,6 +114,16 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty(value = "创建时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
+
+
+        @ExcelProperty("过期时间")
+        @ApiModelProperty(value = "过期时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime timeout;
+        @ExcelProperty("状态说明")
+        @ApiModelProperty(value = "过期状态说明")
+        private String timeoutStatus;
+
     }
 
 

device-api/src/main/java/com/xy/dto/DeviceSimChargeDto.java

@@ -62,8 +62,8 @@ public class DeviceSimChargeDto {
         @NumberFormat("#0.00")
         private Integer money;
 
-        @ApiModelProperty(value = "代理商费用")
-        @ExcelProperty(value = "代理商费用", converter = CustomFenToYuanConverter.class)
+        @ApiModelProperty(value = "佣金")
+        @ExcelProperty(value = "佣金", converter = CustomFenToYuanConverter.class)
         @NumberFormat("#0.00")
         private Integer agentMoney;
 
@@ -87,10 +87,14 @@ public class DeviceSimChargeDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime createTime;
 
+        @ExcelProperty("过期时间")
+        @ApiModelProperty(value = "过期时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime timeout;
 
-        @ExcelProperty("说明")
-        @ApiModelProperty(value = "备注")
-        private String note;
+        @ApiModelProperty(value = "状态")
+        @ExcelProperty("过期状态说明")
+        private String timeoutStatus;
 
 
     }
@@ -98,7 +102,7 @@ public class DeviceSimChargeDto {
     @Data
     @Accessors(chain = true)
     public static class PageByTopMercVO {
-        
+
         @ApiModelProperty(value = "过期时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime timeout;