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/MerOrderTotalVo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java
index cced7aa..7184c63 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderTotalVo.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;
@@ -37,24 +39,31 @@
private Integer serviceTotal;
@ApiModelProperty(value = "总订单金额")
+
private BigDecimal orderMoney;
@ApiModelProperty(value = "线上订单金额")
+
private BigDecimal onlineMoney;
@ApiModelProperty(value = "线下订单金额")
+
private BigDecimal offlineMoney;
@ApiModelProperty(value = "活动订单金额")
+
private BigDecimal activityMoney;
@ApiModelProperty(value = "周期订单金额")
+
private BigDecimal cycleMoney;
@ApiModelProperty(value = "体验订单金额")
+
private BigDecimal experienceMoney;
@ApiModelProperty(value = "服务订单金额")
+
private BigDecimal serviceMoney;
--
Gitblit v1.7.1