From 0c51a577db337520452022d9d6a22b720ef858d4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 31 十二月 2024 14:13:01 +0800
Subject: [PATCH] 全部代码、数据库提交

---
 xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
index 36b09dc..d25b5f6 100644
--- a/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
+++ b/xinquan-api/xinquan-api-user/src/main/java/com/xinquan/user/api/domain/dto/OrderListDTO.java
@@ -15,15 +15,15 @@
     @ApiModelProperty(value = "兑换时间 2020-01-01 - 2020-12-30")
     private String time;
     @ApiModelProperty(value = "支付方式 1微信 2支付宝 3内购 4余额")
-    private Integer payType;
+    private String payType;
     @ApiModelProperty(value = "用户uid")
     private String uid;
 //    @ApiModelProperty(value = "支付方式 1微信 2支付宝 3内购 4余额 5微信+余额 6支付宝+余额 7内购加余额")
 //    private Integer status;
-    @ApiModelProperty(value = "支付状态(提现状态没有1 只有2和3) 1=待支付 2=已完成 3=已取消(提现失败)")
-    private Integer paymentStatus;
+    @ApiModelProperty(value = "支付状态(提现状态没有1 只有2和3) 1=待支付 2=已完成 3=已取消(提现失败) 4已退款")
+    private String paymentStatus;
     @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单 4=充值 5余额提现")
-    private Integer orderFrom;
+    private String orderFrom;
     @ApiModelProperty(value = "用户名称/手机号")
     private String userNameOrPhone;
     @ApiModelProperty(value = "订单编号/购买内容/提现单号")

--
Gitblit v1.7.1