From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalOrderTotalVo.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 9e4e072..bea7fa1 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,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 com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
@@ -39,25 +41,32 @@
@ApiModelProperty(value = "服务订单数")
private Integer serviceTotal;
- @ApiModelProperty(value = "总订单数")
+ @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")
@@ -67,6 +76,7 @@
private Integer[] orderTotalValue;
@ApiModelProperty(value = "订单金额value")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal[] orderMoneyValue;
@ApiModelProperty(value = "商品类型数量")
--
Gitblit v1.7.1