设备流水详情

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

@@ -451,6 +451,24 @@ public class DeviceDataDto {
         private List<Long> deviceId;
     }
 
+    @Data
+    @Accessors(chain = true)
+    public static class DeviceFlowDetailDTO {
+        @ApiModelProperty(value = "是否统计所有，用于导出明细（false）")
+        private Boolean countAll;
+
+        @ApiModelProperty(value = "设备ID")
+        private Long deviceId;
+
+        @ApiModelProperty(value = "月份-起")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime beginCreateTime;
+
+        @ApiModelProperty(value = "月份-止")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime endCreateTime;
+
+    }
 
     @Data
     @Accessors(chain = true)
@@ -497,6 +515,9 @@ public class DeviceDataDto {
         @ApiModelProperty(value = "商户ID")
         private Long mercId;
 
+        @ApiModelProperty(value = "商户名称")
+        private String mercName;
+
         @ApiModelProperty(value = "设备ID")
         private Long deviceId;
 
@@ -520,7 +541,7 @@ public class DeviceDataDto {
         private DateTime activeTime;
 
         @ApiModelProperty(value = "月平均流水")
-        private Integer monthAvgMoney;
+        private BigDecimal monthAvgMoney;
 
         @ApiModelProperty(value = "总计流水")
         private Integer totalMoney;
@@ -551,6 +572,27 @@ public class DeviceDataDto {
     @Data
     @Accessors(chain = true)
     public static class DeviceFlowDetailVO {
+        @ApiModelProperty(value = "投放时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        private LocalDateTime activeTime;
+
+        @ApiModelProperty(value = "设备ID")
+        private Long deviceId;
+
+        @ApiModelProperty(value = "月平均流水")
+        private BigDecimal monthAvgMoney;
+
+        @ApiModelProperty(value = "总计流水")
+        private Integer totalMoney;
+
+        @ApiModelProperty(value = "流水明细")
+        private List<DeviceFlowDetail> details;
+
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class DeviceFlowDetail {
         @ApiModelProperty(value = "设备ID")
         private Long deviceId;
         @ApiModelProperty(value = "月份")