From da837b5a0e23b47bc1d038547702cab3cecce577 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 17:51:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java | 41 +++++++++++++++++++++++++++++++----------
1 files changed, 31 insertions(+), 10 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 a9dc887..f8c4813 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,9 +1,14 @@
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.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
/**
* @ClassName MgtTotalActivityTotalVo
@@ -28,27 +33,34 @@
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")
@@ -58,15 +70,24 @@
private Integer[] orderTotalValue;
@ApiModelProperty(value = "订单金额value")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal[] orderMoneyValue;
- @ApiModelProperty(value = "商品类型数量key")
- private String[] goodsTypeKey;
+ @ApiModelProperty(value = "商品类型数量")
+ private List<MgtMapIntTotalVo> goodsTypeTotalList;
- @ApiModelProperty(value = "商品类型数量value")
- private Integer[] goodsTypeTotalValue;
+ @ApiModelProperty(value = "商品类型金额")
+ private List<MgtMapBigTotalVo> goodsTypeMoneyList;
- @ApiModelProperty(value = "商品类型金额value")
- private BigDecimal[] goodsTypeMoneyValue;
+ @ApiModelProperty(value = "活动年龄分布key")
+ private String[] activityAgeKey;
+ @ApiModelProperty(value = "活动年龄分布value")
+ private Integer[] activityAgeValue;
+
+ @ApiModelProperty(value = "参与人数key")
+ private String[] joinMemberTotalKey;
+
+ @ApiModelProperty(value = "参与人数key")
+ private Integer[] joinMemberTotalValue;
}
--
Gitblit v1.7.1