From 0774ea976b6aa86a8a7de334fa24fbd7524295d5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:57:11 +0800
Subject: [PATCH] 看板统计
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 16 ++++++++++++++--
1 files changed, 14 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..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
@@ -32,16 +32,22 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
@ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
@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 +56,10 @@
@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