From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 04 十一月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交
---
xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/dto/OrderListDTO.java b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
similarity index 71%
rename from xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/dto/OrderListDTO.java
rename to xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
index 7cada67..36b09dc 100644
--- a/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/dto/OrderListDTO.java
+++ b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
@@ -1,4 +1,4 @@
-package com.xinquan.order.api.domain.dto;
+package com.xinquan.user.api.domain.dto;
import com.xinquan.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
@@ -14,18 +14,20 @@
public class OrderListDTO extends BasePage {
@ApiModelProperty(value = "兑换时间 2020-01-01 - 2020-12-30")
private String time;
- @ApiModelProperty(value = "支付方式 1微信 2支付宝 3余额 4内购")
+ @ApiModelProperty(value = "支付方式 1微信 2支付宝 3内购 4余额")
private Integer payType;
@ApiModelProperty(value = "用户uid")
private String uid;
// @ApiModelProperty(value = "支付方式 1微信 2支付宝 3内购 4余额 5微信+余额 6支付宝+余额 7内购加余额")
// private Integer status;
- @ApiModelProperty(value = "支付状态 1=待支付 2=已完成 3=已取消")
+ @ApiModelProperty(value = "支付状态(提现状态没有1 只有2和3) 1=待支付 2=已完成 3=已取消(提现失败)")
private Integer paymentStatus;
- @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单 4=充值")
+ @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单 4=充值 5余额提现")
private Integer orderFrom;
@ApiModelProperty(value = "用户名称/手机号")
private String userNameOrPhone;
- @ApiModelProperty(value = "订单编号/购买内容")
+ @ApiModelProperty(value = "订单编号/购买内容/提现单号")
private String buyContent;
+ @ApiModelProperty(value = "选中数据的ids")
+ private String ids;
}
--
Gitblit v1.7.1