From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 17 一月 2025 16:40:43 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 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 d7977f4..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,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; @@ -39,45 +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 = "商品类型数量") - private List<MgtMapTotalVo> goodsTypeTotalList; + @ApiModelProperty(value = "销售占比数量") + private List<MgtMapIntTotalVo> goodsTypeTotalList; - @ApiModelProperty(value = "商品类型金额") + @ApiModelProperty(value = "销售占比金额") private List<MgtMapBigTotalVo> goodsTypeMoneyList; - @ApiModelProperty(value = "商品排行") + @ApiModelProperty(value = "销售排行") private List<MgtMapBigTotalVo> goodsRankList; - @ApiModelProperty(value = "来源排行") + @ApiModelProperty(value = "订单渠道排行") private List<MgtMapBigTotalVo> orderFromRankList; } -- Gitblit v1.7.1