From 039dbb9ab16f295e91cfcdea5bf68bf16bc0417e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 七月 2025 09:22:33 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
index 8c1a5d2..e9e2657 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
@@ -35,6 +35,9 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+
+ @ApiModelProperty(value="三方订单号")
+ private String tripartiteOrderId;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
@@ -48,11 +51,12 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty(value="应收金额")
- private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
+
+ @ApiModelProperty(value="应收全额")
+ private BigDecimal receivableMoney;
@ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
@@ -60,6 +64,9 @@
@ApiModelProperty(value="订单已收金额")
private BigDecimal receiveMoney;
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="订单未支付金额")
private BigDecimal unPaidMoney;
--
Gitblit v1.7.1