From cead7b98d5cebc0825b919799e23732877361de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 18:39:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 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 ff23b5a..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
@@ -1,10 +1,11 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
+import java.util.Date;
/**
* @author jqs34
@@ -19,8 +20,11 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
+
+ @ApiModelProperty(value="订单状态")
+ private Integer orderStatus;
@ApiModelProperty(value = "商品总价")
private BigDecimal orderGoodsMoney;
@@ -28,15 +32,34 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
+ @ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单已收金额")
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @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