From dfe810a2108e479c4ed4f8d24dd181140afd8730 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 01 九月 2023 09:31:05 +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/MgtOrderDetailVo.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
index ce47988..114f644 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -46,15 +48,19 @@
private String orderFrom;
@ApiModelProperty(value="订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@ApiModelProperty(value="应付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value="订单未支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
@ApiModelProperty(value="秒杀活动")
@@ -65,9 +71,11 @@
private Date createTime;
@ApiModelProperty(value="线上支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal onlinePayMoney;
@ApiModelProperty(value="线下支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal offlinePayMoney;
@ApiModelProperty(value="线上支付时间")
@@ -99,4 +107,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
+ @ApiModelProperty(value="支付记录")
+ List<MgtOrderPayListVo> orderPayListVoList;
+
}
--
Gitblit v1.7.1