Merge remote-tracking branch 'origin/master' into test

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

@@ -76,6 +76,8 @@ public class MercMiniDeviceDto {
     @Data
     @Accessors(chain = true)
     public static class HomePageMonthDTO {
+
+        @ApiModelProperty(value = "日期", required = false)
         @JsonFormat(pattern = "yyyy-MM")
         private DateTime date;
     }

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 
 /**
@@ -66,6 +67,7 @@ public class MercMiniSalseCountDto {
     @Data
     @Accessors(chain = true)
     public static class HomePageMonthDTO {
+        @ApiModelProperty(value = "日期", required = false)
         @JsonFormat(pattern = "yyyy-MM")
         private DateTime date;
     }
@@ -73,8 +75,24 @@ public class MercMiniSalseCountDto {
     @Data
     @Accessors(chain = true)
     public static class DayDTO {
+
+        @ApiModelProperty(value = "日期", required = false, hidden = true)
+        @JsonFormat(pattern = "yyyy-MM-dd")
+        private DateTime date;
+
+        @ApiModelProperty(value = "商户ID", required = false, hidden = true)
+        private Long mercId;
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class DayDetailDTO {
+
+        @NotNull()
+        @ApiModelProperty(value = "日期", required = true)
         @JsonFormat(pattern = "yyyy-MM-dd")
         private DateTime date;
+
     }
 
     @Data
@@ -137,6 +155,7 @@ public class MercMiniSalseCountDto {
         @ApiModelProperty(value = "历史订单今日补收-订单数量")
         private Integer dayHisFillNum;
 
+
         @ApiModelProperty(value = "历史订单今日补退-订单金额")
         private Integer dayHisRefundMoney;
 
@@ -155,47 +174,26 @@ public class MercMiniSalseCountDto {
 
     }
 
+
     @Data
     @Accessors(chain = true)
-    public static class DayCountVO {
-
-        @ApiModelProperty("订单数")
-        private Integer orderNum;
-
-        @ApiModelProperty("销售额")
-        private Integer salesPrice;
-
-        @ApiModelProperty("退款金额")
-        private Integer refundMoney;
+    public static class MonthCountVO {
+        @ApiModelProperty(value = "本月总收益")
+        private Integer monthTotalRevenue;
 
-        @ApiModelProperty("今日产生的订单发生退款金额")
-        private Integer dayRefundMoney;
+        @ApiModelProperty(value = "本月收益列表")
+        private List<DayRevenue> revenueList;
 
-        @ApiModelProperty("在今日退款的历史订单发生的退款金额")
-        private Integer dayHisRefundMoney;
 
     }
 
     @Data
     @Accessors(chain = true)
-    public static class MonthCountVO {
-
-        @ApiModelProperty("订单数")
-        private Integer orderNum;
-
-        @ApiModelProperty("销售额")
-        private Integer salesPrice;
-
-        @ApiModelProperty("退款金额")
-        private Integer refundMoney;
-
-
-        @ApiModelProperty("当月产生的订单发生退款金额")
-        private Integer monthRefundMoney;
-
-        @ApiModelProperty("在当月退款的历史订单发生的退款金额")
-        private Integer monthHisRefundMoney;
-
+    public static class DayRevenue {
+        @ApiModelProperty(value = "日收益")
+        private Integer dayTotalRevenue;
+        @ApiModelProperty(value = "日期")
+        private String date;
 
     }