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/MgtTotalActivityTotalVo.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
index 7d29ede..e4b99dc 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtTotalActivityTotalVo.java
@@ -1,7 +1,9 @@
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.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -31,15 +33,19 @@
private Integer serviceTotal;
@ApiModelProperty(value = "总订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@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 = "总人数")
@@ -61,10 +67,11 @@
private Integer[] orderTotalValue;
@ApiModelProperty(value = "订单金额value")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal[] orderMoneyValue;
@ApiModelProperty(value = "商品类型数量")
- private List<MgtMapTotalVo> goodsTypeTotalList;
+ private List<MgtMapIntTotalVo> goodsTypeTotalList;
@ApiModelProperty(value = "商品类型金额")
private List<MgtMapBigTotalVo> goodsTypeMoneyList;
--
Gitblit v1.7.1