From a3d99a38fb3c56d9948eabb64dd301cb0aa2765e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 六月 2025 12:03:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 18 ++++++++++++++++--
1 files changed, 16 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 08151c4..465c9a0 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
@@ -6,7 +6,6 @@
import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* @author jqs34
@@ -33,19 +32,34 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
@ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
+ @ApiModelProperty(value="订单已收金额")
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
- @ApiModelProperty(value="订单未支付金额")
+ @ApiModelProperty(value="未收金额")
private BigDecimal unPaidMoney;
@ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+
+ @ApiModelProperty(value = "支付方式1微信2现金3支付宝")
+ private String thisReceiveType;
+
+ @ApiModelProperty(value = "结清标记0未结清1已结清")
+ private Integer closeFlag;
}
--
Gitblit v1.7.1