From 6058af744bdf4fe6a3856c46fe31cfb4dbd8e255 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 11:54:01 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderGetVo.java | 14 ++++++++++++++
1 files changed, 14 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 f889c66..8592424 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;
@@ -23,6 +25,9 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+
+ @ApiModelProperty(value="三方订单号")
+ private String tripartiteOrderId;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
@@ -31,19 +36,24 @@
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;
@@ -56,6 +66,7 @@
@ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value="商户id")
@@ -92,4 +103,7 @@
@ApiModelProperty(value="结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endTime;
+
+ @ApiModelProperty(value="取消方（1=平台，2=商户，3=用户）")
+ private Integer cancelType;
}
--
Gitblit v1.7.1