From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
index e11bf70..003bdb2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
@@ -1,9 +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;
/**
@@ -19,14 +21,26 @@
@ApiModelProperty(value = "用户id")
private Long userId;
+ @ApiModelProperty(value = "用户姓名")
+ private String userName;
+
+ @ApiModelProperty(value = "用户昵称")
+ private String nickName;
+
+ @ApiModelProperty(value = "用户电话")
+ private String userMobile;
+
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
+
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
@ApiModelProperty(value = "商品总价")
private BigDecimal orderGoodsMoney;
@@ -34,21 +48,41 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
- private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="应收全额")
+ private BigDecimal receivableMoney;
+
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="订单已收金额")
+ private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
+ @ApiModelProperty(value="订单未支付金额")
private BigDecimal unPaidMoney;
- @ApiModelProperty("订单备注")
+ @ApiModelProperty(value="订单备注")
private String orderRemark;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value="订单来源")
+ private Integer orderFrom;
+
+ @ApiModelProperty(value="订单来源")
+ private String orderFromDesc;
+
+ @ApiModelProperty(value="活动名字")
+ private String activityName;
+
+ @ApiModelProperty(value="订单商品列表")
private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
}
--
Gitblit v1.7.1