From 83c1a766957e4c74ea6e81c6e9b18f1b692b1b7b Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 17:50:40 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 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 23498a3..ea0df7f 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
@@ -1,5 +1,7 @@
 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;
@@ -31,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")
@@ -61,6 +70,7 @@
     private Integer[] orderTotalValue;
 
     @ApiModelProperty(value = "订单数量value")
+    @JsonSerialize(using = ToStringSerializer.class)
     private BigDecimal[] orderMoneyValue;
 
     @ApiModelProperty(value = "商品类型数量")
@@ -72,10 +82,10 @@
     @ApiModelProperty(value = "活动次数排行")
     private List<MgtMapIntTotalVo> activityRankList;
 
-    @ApiModelProperty(value = "活动次数排行")
+    @ApiModelProperty(value = "商户活动销售额排名")
     private List<MgtMapBigTotalVo> shopSalesRankList;
 
-    @ApiModelProperty(value = "活动次数排行")
+    @ApiModelProperty(value = "活动销售额排名")
     private List<MgtMapBigTotalVo> activitySalesRankList;
 
     @ApiModelProperty(value = "活动年龄分布key")
@@ -84,4 +94,16 @@
     @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