From 7a74745bad7ff20df9e170433c1e1cb851ce7fa9 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期二, 29 七月 2025 09:17:00 +0800 Subject: [PATCH] Merge branches '2.0' and '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java index 7ea30ae..076ff99 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java @@ -29,6 +29,22 @@ @ApiModelProperty(value = "线下订单数") private Integer offlineTotal; + @ApiModelProperty(value = "美团订单数") + private Integer meituan; + @ApiModelProperty(value = "美团订单金额") + private BigDecimal meituanAmount; + + @ApiModelProperty(value = "抖音订单数") + private Integer douyin; + @ApiModelProperty(value = "抖音订单金额") + private BigDecimal douyinAmount; + + @ApiModelProperty(value = "快手订单数") + private Integer kuaishou; + @ApiModelProperty(value = "快手订单金额") + private BigDecimal kuaishouAmount; + + @ApiModelProperty(value = "活动订单数") private Integer activityTotal; @@ -40,6 +56,9 @@ @ApiModelProperty(value = "服务订单数") private Integer serviceTotal; + + @ApiModelProperty(value = "单品数量") + private Integer itemTotal; @ApiModelProperty(value = "总订单金额") @JsonSerialize(using = ToStringSerializer.class) @@ -69,6 +88,10 @@ @JsonSerialize(using = ToStringSerializer.class) private BigDecimal serviceMoney; + @ApiModelProperty(value = "单品金额") + @JsonSerialize(using = ToStringSerializer.class) + private BigDecimal itemMoney; + @ApiModelProperty(value = "订单分布日期") private String[] orderTotalKey; -- Gitblit v1.7.1