From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java |   32 +++++++++++++-------------------
 1 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
index 9395786..8fa5562 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java
@@ -1,9 +1,12 @@
 package com.ruoyi.order.domain.vo;
 
+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;
 
 /**
  * @author jqs34
@@ -36,7 +39,7 @@
     @ApiModelProperty(value = "服务订单数")
     private Integer serviceTotal;
 
-    @ApiModelProperty(value = "总订单数")
+    @ApiModelProperty(value = "总订单金额")
     private BigDecimal orderMoney;
 
     @ApiModelProperty(value = "线上订单金额")
@@ -63,27 +66,18 @@
     @ApiModelProperty(value = "订单数量value")
     private Integer[] orderTotalValue;
 
-    @ApiModelProperty(value = "订单数量value")
+    @ApiModelProperty(value = "订单金额value")
     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 = "商品排行")
+    private List<MgtMapBigTotalVo> goodsRankList;
 
-    @ApiModelProperty(value = "商品排行key")
-    private String[] goodsRankKey;
-
-    @ApiModelProperty(value = "商品排行value")
-    private BigDecimal[] goodsRankValue;
-
-    @ApiModelProperty(value = "来源排行key")
-    private String[] orderFromRankKey;
-
-    @ApiModelProperty(value = "来源排行value")
-    private BigDecimal[] orderFromRankValue;
+    @ApiModelProperty(value = "来源排行")
+    private List<MgtMapBigTotalVo> orderFromRankList;
 }

--
Gitblit v1.7.1