Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java

@@ -41,6 +41,9 @@
    @ApiModelProperty(value = "服务订单数")
    private Integer serviceTotal;

    @ApiModelProperty(value = "单品数量")
    private Integer itemTotal;

    @ApiModelProperty(value = "总订单金额")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoney;
@@ -69,25 +72,28 @@
    @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")
    @JsonSerialize(using = ToStringSerializer.class)
    @ApiModelProperty(value = "订单分布金额")
    private BigDecimal[] orderMoneyValue;

    @ApiModelProperty(value = "商品类型数量")
    @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;
}