From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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..29609b2 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,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;
/**
* @author jqs34
@@ -36,54 +41,59 @@
@ApiModelProperty(value = "服务订单数")
private Integer serviceTotal;
- @ApiModelProperty(value = "总订单数")
+ @ApiModelProperty(value = "单品数量")
+ private Integer itemTotal;
+
+ @ApiModelProperty(value = "总订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@ApiModelProperty(value = "线上订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal onlineMoney;
@ApiModelProperty(value = "线下订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal offlineMoney;
@ApiModelProperty(value = "活动订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityMoney;
@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 = "订单数量key")
+ @ApiModelProperty(value = "单品金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal itemMoney;
+
+ @ApiModelProperty(value = "订单分布日期")
private String[] orderTotalKey;
- @ApiModelProperty(value = "订单数量value")
+ @ApiModelProperty(value = "订单分布数量")
private Integer[] orderTotalValue;
- @ApiModelProperty(value = "订单数量value")
+ @ApiModelProperty(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