From bb95ec391d10f04702822705ecb82c027e849b98 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 15 八月 2023 19:16:09 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
index 2a37df3..9f095b4 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
@@ -38,10 +38,13 @@
@ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
- @ApiModelProperty(value="实收金额")
+ @ApiModelProperty(value="订单已收金额")
private BigDecimal receiveMoney;
- @ApiModelProperty(value="已收金额")
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
@ApiModelProperty(value="未收金额")
@@ -50,4 +53,7 @@
@ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+
+ @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
+ private String thisReceiveType;
}
--
Gitblit v1.7.1