From bc624422bc7575385b583e30ca218a29f0189629 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 24 七月 2025 09:23:17 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 419e012..3e06e25 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
@@ -1,10 +1,14 @@
package com.ruoyi.order.domain.vo;
+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;
import java.math.BigDecimal;
+import java.util.Date;
/**
* @author jqs34
@@ -22,14 +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 = "支付截止时间")
- private String payDeadlineTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
@ApiModelProperty(value = "appId")
private String appId;
@@ -46,13 +59,19 @@
@ApiModelProperty(value = "package")
@JsonProperty("package")
private String packageStr;
-
+
@ApiModelProperty(value = "签名方式")
- private String tradeType;
-
+ private String signType;
+
@ApiModelProperty(value = "签名")
private String paySign;
-
+
@ApiModelProperty(value = "预支付回话标识")
private String prepayId;
+
+ @ApiModelProperty(value = "是否可抽奖（0=否，1=是）")
+ private Boolean lotteryDraw;
+
+ @ApiModelProperty(value = "抽奖活动id")
+ private String lotteryEventId;
}
--
Gitblit v1.7.1