From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 7caa548..8c1a5d2 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,6 +1,5 @@
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;
@@ -25,17 +24,23 @@
@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;
@@ -43,31 +48,37 @@
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
private BigDecimal receivableMoney;
- @ApiModelProperty("应收订金")
+ @ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="订单已收金额")
+ private BigDecimal receiveMoney;
+
+ @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("订单来源")
+ @ApiModelProperty(value="订单来源")
private Integer orderFrom;
- @ApiModelProperty("订单来源")
+ @ApiModelProperty(value="订单来源")
private String orderFromDesc;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="活动名字")
+ private String activityName;
+
+ @ApiModelProperty(value="订单商品列表")
private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
}
--
Gitblit v1.7.1