From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index 54181bd..7217d93 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -31,21 +31,26 @@
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+
private BigDecimal couponDiscount;
@ApiModelProperty(value="应收金额")
+
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
+
private BigDecimal receivableDeposit;
@ApiModelProperty(value="订单商品列表")
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
@ApiModelProperty(value="订单支付金额")
+
private BigDecimal payMoney;
@ApiModelProperty(value="创建时间")
@@ -73,12 +78,15 @@
private String userMobile;
@ApiModelProperty(value="实收金额")
+
private BigDecimal realReceiveMoney;
@ApiModelProperty(value="已收金额")
+
private BigDecimal receiveMoney;
@ApiModelProperty(value="未收金额")
+
private BigDecimal unReceiveMoney;
@ApiModelProperty(value="支付方式1.全款2订金")
--
Gitblit v1.7.1