From b646898adf3f2ad119dd9fd1c7c01d7f0742bf97 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 31 七月 2025 11:41:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java
index f32be20..57520f8 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderTotal.java
+++ b/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,55 @@
@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;
+
+ @ApiModelProperty(value="活动订单总数")
+ private Integer thirdOrderTotal;
+
+ @ApiModelProperty(value="活动订单金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal thirdOrderMoneyTotal;
+
+ @ApiModelProperty(value="活动订单已付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal thirdPayMoneyTotal;
+
+ @ApiModelProperty(value="活动订单未付金额总数")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal thirdUnPayMoneyTotal;
}
--
Gitblit v1.7.1