From 6ab383249b70a9646ffde1474b59dcc7d0b97df6 Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 15:05:15 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 cc47944..2a37df3 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,11 +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.Date;
-import java.util.List;
/**
* @author jqs34
@@ -20,10 +20,10 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
- @ApiModelProperty("订单状态")
+ @ApiModelProperty(value="订单状态")
private Integer orderStatus;
@ApiModelProperty(value = "商品总价")
@@ -32,18 +32,22 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="实收金额")
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value="已收金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="未收金额")
private BigDecimal unPaidMoney;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
}
--
Gitblit v1.7.1