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

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

@@ -10,6 +10,7 @@ import lombok.experimental.Accessors;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.List;
 
 public class MercMiniDeviceDto {
@@ -219,6 +220,8 @@ public class MercMiniDeviceDto {
     @Data
     @Accessors(chain = true)
     public static class DayCountVO {
+        @ApiModelProperty(name = "订单总成本价")
+        private Integer orderTotalPriceCost;
 
         @ApiModelProperty("订单数")
         private Integer orderNum;
@@ -253,6 +256,12 @@ public class MercMiniDeviceDto {
         @ApiModelProperty(value = "到账金额=付款金额-退款金额")
         private Integer dayOrderRealMoney;
 
+        @ApiModelProperty(value = "今日毛利率 （销售额-成本）/销售额")
+        private BigDecimal grossProfitMargin;
+
+        @ApiModelProperty(value = "昨日毛利率 （销售额-成本）/销售额")
+        private BigDecimal hisGrossProfitMargin;
+
 
     }