From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
index dc52ff3..7217d93 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyOrderVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,44 +21,55 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
- @ApiModelProperty("订单来源1.商城2.秒杀活动3.线下创建")
+ @ApiModelProperty(value="订单来源1.商城2.秒杀活动3.线下创建")
private Integer orderFrom;
@ApiModelProperty(value = "商品总价")
+
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
+
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
+
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="订单商品列表")
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
- @ApiModelProperty("订单支付金额")
+ @ApiModelProperty(value="订单支付金额")
+
private BigDecimal payMoney;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("支付时间")
+ @ApiModelProperty(value="支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
- @ApiModelProperty("核销时间")
+ @ApiModelProperty(value="核销时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date useTime;
- @ApiModelProperty("订单备注")
+ @ApiModelProperty(value="订单备注")
private String orderRemark;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
@ApiModelProperty(value = "用户姓名")
private String userName;
@@ -66,6 +77,21 @@
@ApiModelProperty(value = "用户电话")
private String userMobile;
- @ApiModelProperty("结清标记0否1是")
+ @ApiModelProperty(value="实收金额")
+
+ private BigDecimal realReceiveMoney;
+
+ @ApiModelProperty(value="已收金额")
+
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value="未收金额")
+
+ private BigDecimal unReceiveMoney;
+
+ @ApiModelProperty(value="支付方式1.全款2订金")
+ private Integer payType;
+
+ @ApiModelProperty(value="结清标记0否1是")
private Integer closeFlag;
}
--
Gitblit v1.7.1