From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
index a594994..5271477 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
@@ -23,29 +23,31 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="支付方式1全款2订金")
+ private Integer payType;
+
+
@ApiModelProperty(value="订单状态")
private Integer orderStatus;
@ApiModelProperty(value = "商品总价")
-
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
-
private BigDecimal couponDiscount;
@ApiModelProperty(value="应付金额")
-
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
-
private BigDecimal receivableDeposit;
- @ApiModelProperty(value="实收金额")
-
+ @ApiModelProperty(value="应收金额")
private BigDecimal receiveMoney;
+ @ApiModelProperty(value="实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="已收金额")
private BigDecimal payMoney;
--
Gitblit v1.7.1