From 06272f6bb1002badb75f67d6c44a1b00bba32a76 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 14:34:28 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java |   10 ++++++++--
 1 files changed, 8 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..5a8bf91 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;
 
@@ -28,14 +30,16 @@
     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 +58,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