From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 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 ab03a67..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
@@ -48,47 +48,64 @@
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal serviceMoney;
- @ApiModelProperty(value = "总人数")
+ @ApiModelProperty(value = "总参与人数")
+ private Integer orderJoinPerson;
+
+ @ApiModelProperty(value = "总获客人数")
private Integer orderPerson;
- @ApiModelProperty(value = "周期人数")
+ @ApiModelProperty(value = "周期获客人数")
private Integer cyclePerson;
- @ApiModelProperty(value = "体验人数")
+ @ApiModelProperty(value = "体验获客人数")
private Integer experiencePerson;
- @ApiModelProperty(value = "服务人数")
+ @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;
+
+ @ApiModelProperty(value = "参与人数key")
+ private Integer[] joinMemberTotalValue;
+
+ @ApiModelProperty(value = "获客人数key")
+ private String[] getMemberTotalKey;
+
+ @ApiModelProperty(value = "获客人数key")
+ private Integer[] getMemberTotalValue;
}
--
Gitblit v1.7.1