From 3dddd301e97c263dda6326c89fa11176d5960b04 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 30 六月 2025 12:11:36 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java | 14 ++++++++++++++
1 files changed, 14 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..64b2c55 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;
@@ -42,19 +44,26 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="支付流水号")
+ private String outTradeNo;
+
@ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
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 +74,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 +110,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
+ @ApiModelProperty(value="支付记录")
+ List<MgtOrderPayListVo> orderPayListVoList;
+
}
--
Gitblit v1.7.1