From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java
index 794706e..69de0e7 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesOrderVo.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@@ -15,12 +16,31 @@
@ApiModelProperty(value = "订单id")
private Long orderId ;
-
@ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
+ @ApiModelProperty(value = "昵称")
+ private String nickName;
+ @ApiModelProperty(value = "头像")
+ private String avatarUrl;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNo;
+
+ @ApiModelProperty(value = "收益金额")
+ private Double amount;
+
+ @ApiModelProperty(value = "订单金额")
+ private Double orderMoney;
+
+
+ @ApiModelProperty(value = " 收益类型1，推广收益，2邀请收益")
+ private Integer revenueType;
+
+ @ApiModelProperty(value = " 结算状态1，待结算，2，已结算，3已退款")
+ private Integer orderStatus;
--
Gitblit v1.9.1