From 2e3f5dfec643f2b2b91bf70e68dd882a1a32140c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 九月 2025 10:24:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java | 18 ++++++++++++++++++
1 files changed, 18 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..bb2bc91 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,9 @@
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 com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,19 +45,29 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="第三方订单号")
+ private String tripartiteOrderId;
+
+ @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 +78,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 +114,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
+ @ApiModelProperty(value="支付记录")
+ List<MgtOrderPayListVo> orderPayListVoList;
+
}
--
Gitblit v1.7.1