From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtOrderDetailVo.java | 54 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 34 insertions(+), 20 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 0c826e2..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;
@@ -18,7 +20,7 @@
@Data
public class MgtOrderDetailVo {
- @ApiModelProperty("订单id")
+ @ApiModelProperty(value="订单id")
private String orderId;
@ApiModelProperty(value = "用户id")
@@ -33,70 +35,82 @@
@ApiModelProperty(value = "用户电话")
private String userMobile;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsDetailVo> orderGoodsDetailVoList;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private String orderStatus;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ @ApiModelProperty(value="支付流水号")
+ private String outTradeNo;
+
+ @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
private String orderFrom;
- @ApiModelProperty("订单金额")
+ @ApiModelProperty(value="订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
- @ApiModelProperty("应付金额")
+ @ApiModelProperty(value="应付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="订单未支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
- @ApiModelProperty("秒杀活动")
+ @ApiModelProperty(value="秒杀活动")
private String activityName;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("线上支付金额")
+ @ApiModelProperty(value="线上支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal onlinePayMoney;
- @ApiModelProperty("线下支付金额")
+ @ApiModelProperty(value="线下支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal offlinePayMoney;
- @ApiModelProperty("线上支付时间")
+ @ApiModelProperty(value="线上支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
- @ApiModelProperty("线下支付时间")
+ @ApiModelProperty(value="线下支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date offPayTime;
- @ApiModelProperty("完成时间")
+ @ApiModelProperty(value="完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
- @ApiModelProperty("取消时间")
+ @ApiModelProperty(value="取消时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelTime;
- @ApiModelProperty("订单备注")
+ @ApiModelProperty(value="订单备注")
private String orderRemark;
- @ApiModelProperty("核销店铺id")
+ @ApiModelProperty(value="核销店铺id")
private Long shopId;
- @ApiModelProperty("核销店铺")
+ @ApiModelProperty(value="核销店铺")
private String shopName;
- @ApiModelProperty("核销时间")
+ @ApiModelProperty(value="核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
+ @ApiModelProperty(value="支付记录")
+ List<MgtOrderPayListVo> orderPayListVoList;
+
}
--
Gitblit v1.7.1