From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '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/MgtPlTotalActivityTotalVo.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
index ea0df7f..3ca279b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
@@ -63,37 +63,39 @@
@ApiModelProperty(value = "服务获客人数")
private Integer servicePerson;
- @ApiModelProperty(value = "订单数量key")
+ @ApiModelProperty(value = "订单分布日期")
private String[] orderTotalKey;
- @ApiModelProperty(value = "订单数量value")
+ @ApiModelProperty(value = "订单分布数量")
private Integer[] orderTotalValue;
- @ApiModelProperty(value = "订单数量value")
- @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value = "订单分布金额")
private BigDecimal[] orderMoneyValue;
- @ApiModelProperty(value = "商品类型数量")
+ @ApiModelProperty(value = "销售占比数量")
private List<MgtMapIntTotalVo> goodsTypeTotalList;
- @ApiModelProperty(value = "商品类型金额")
+ @ApiModelProperty(value = "销售占比金额")
private List<MgtMapBigTotalVo> goodsTypeMoneyList;
- @ApiModelProperty(value = "活动次数排行")
+ @ApiModelProperty(value = "店铺活动次数排行")
private List<MgtMapIntTotalVo> activityRankList;
- @ApiModelProperty(value = "商户活动销售额排名")
- private List<MgtMapBigTotalVo> shopSalesRankList;
+ @ApiModelProperty(value = "店铺活动销售额排名店铺名称")
+ private String[] shopSalesRankKey;
- @ApiModelProperty(value = "活动销售额排名")
+ @ApiModelProperty(value = "店铺活动销售额排名金额")
+ private BigDecimal[] shopSalesRankValue;
+
+ @ApiModelProperty(value = "店铺活动分类销售额排名")
private List<MgtMapBigTotalVo> activitySalesRankList;
- @ApiModelProperty(value = "活动年龄分布key")
+ /*@ApiModelProperty(value = "活动年龄分布key")
private String[] activityAgeKey;
@ApiModelProperty(value = "活动年龄分布value")
private Integer[] activityAgeValue;
-
+*/
@ApiModelProperty(value = "参与人数key")
private String[] joinMemberTotalKey;
--
Gitblit v1.7.1