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/AppUserOrderGetVo.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java
index ba64763..0886d5e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.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;
@@ -31,16 +33,26 @@
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
@ApiModelProperty(value="应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableDeposit;
+
+
+ @ApiModelProperty(value="待支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal unpaidMoney;
+
@ApiModelProperty(value="订单商品列表")
@@ -51,6 +63,7 @@
@ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value="商户id")
@@ -83,4 +96,8 @@
@ApiModelProperty(value = "核销码")
private String verifyCode;
+
+ @ApiModelProperty(value="结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
}
--
Gitblit v1.7.1