From 7a74745bad7ff20df9e170433c1e1cb851ce7fa9 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 29 七月 2025 09:17:00 +0800
Subject: [PATCH] Merge branches '2.0' and '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/MerMemberNoClearOrderVo.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 9f095b4..ba73378 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,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @author jqs34
@@ -32,6 +33,9 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
@ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
@@ -56,4 +60,10 @@
@ApiModelProperty(value = "支付方式1微信2现金3支付宝")
private String thisReceiveType;
+
+ @ApiModelProperty(value = "结清标记0未结清1已结清")
+ private Integer closeFlag;
+
+ @ApiModelProperty("商品明细")
+ private List<AppGoodsInfoVo> goodsList;
}
--
Gitblit v1.7.1