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/MgtTotalActivityTotalVo.java | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
index 7d29ede..d646a39 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
@@ -1,7 +1,9 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,47 +33,60 @@
private Integer serviceTotal;
@ApiModelProperty(value = "总订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@ApiModelProperty(value = "周期订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal cycleMoney;
@ApiModelProperty(value = "体验订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal experienceMoney;
@ApiModelProperty(value = "服务订单金额")
+ @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")
+ @ApiModelProperty(value = "订单分布金额")
private BigDecimal[] orderMoneyValue;
- @ApiModelProperty(value = "商品类型数量")
- private List<MgtMapTotalVo> goodsTypeTotalList;
+ @ApiModelProperty(value = "销售占比数量")
+ private List<MgtMapIntTotalVo> goodsTypeTotalList;
- @ApiModelProperty(value = "商品类型金额")
+ @ApiModelProperty(value = "销售占比金额")
private List<MgtMapBigTotalVo> goodsTypeMoneyList;
- @ApiModelProperty(value = "活动年龄分布key")
+ /* @ApiModelProperty(value = "活动年龄分布key")
private String[] activityAgeKey;
@ApiModelProperty(value = "活动年龄分布value")
- private Integer[] activityAgeValue;
+ private Integer[] activityAgeValue;*/
+
+ @ApiModelProperty(value = "参与人数key")
+ private String[] joinMemberTotalKey;
+
+ @ApiModelProperty(value = "参与人数value")
+ private Integer[] joinMemberTotalValue;
}
--
Gitblit v1.7.1