Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -15,33 +17,40 @@
@Data
public class MgtOrderTotal {

    @ApiModelProperty("订单总数")
    @ApiModelProperty(value="订单总数")
    private Integer orderTotal;

    @ApiModelProperty("订单金额总数")
    @ApiModelProperty(value="订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal orderMoneyTotal;

    @ApiModelProperty("门店订单总数")
    @ApiModelProperty(value="门店订单总数")
    private Integer shopOrderTotal;

    @ApiModelProperty("门店订单金额总数")
    @ApiModelProperty(value="门店订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopOrderMoneyTotal;

    @ApiModelProperty("门店订单已付金额总数")
    @ApiModelProperty(value="门店订单已付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopPayMoneyTotal;

    @ApiModelProperty("门店订单未付金额总数")
    @ApiModelProperty(value="门店订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal shopUnPayMoneyTotal;

    @ApiModelProperty("活动订单总数")
    @ApiModelProperty(value="活动订单总数")
    private Integer activityOrderTotal;

    @ApiModelProperty("活动订单金额总数")
    @ApiModelProperty(value="活动订单金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityOrderMoneyTotal;

    @ApiModelProperty("活动订单已付金额总数")
    @ApiModelProperty(value="活动订单已付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityPayMoneyTotal;

    @ApiModelProperty("活动订单未付金额总数")
    @ApiModelProperty(value="活动订单未付金额总数")
    @JsonSerialize(using = ToStringSerializer.class)
    private BigDecimal  activityUnPayMoneyTotal;
}