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/AppPlaceOrderVo.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java
index b57aaec..ba4d80f 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java
@@ -2,6 +2,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,18 +26,23 @@
@ApiModelProperty(value = "订单编号")
private String orderNo;
+ @ApiModelProperty(value = "金额为零无需支付 0否1是")
+ private Integer zeroFlag;
+
@ApiModelProperty(value = "支付方式1.全款2.订金")
private Integer payType;
@ApiModelProperty(value = "支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value = "未支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unpaidMoney;
@ApiModelProperty(value = "支付截止时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date payDeadlineTime;
+ private Date endTime;
@ApiModelProperty(value = "appId")
private String appId;
@@ -54,11 +61,13 @@
private String packageStr;
@ApiModelProperty(value = "签名方式")
- private String tradeType;
+ private String signType;
@ApiModelProperty(value = "签名")
private String paySign;
@ApiModelProperty(value = "预支付回话标识")
private String prepayId;
+
+
}
--
Gitblit v1.7.1