From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/Order.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/Order.java b/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/Order.java
index ae8645d..4d52d5f 100644
--- a/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/Order.java
+++ b/xinquan-api/xinquan-api-order/src/main/java/com/xinquan/order/api/domain/Order.java
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "备注 前端忽略")
@TableField(exist = false)
private String remark;
+ @ApiModelProperty(value = "余额支付金额 前端忽略")
+ @TableField(exist = false)
+ private BigDecimal balance;
@ApiModelProperty(value = "用户名称")
@TableField(exist = false)
private String userName;
@@ -80,6 +83,15 @@
@ApiModelProperty(value = "购买内容-课程-courseUid")
@TableField(exist = false)
private String courseUid;
+ @ApiModelProperty(value = "课程类型")
+ @TableField(exist = false)
+ private String courseType;
+ @ApiModelProperty(value = "课程类型 1线上 2线下")
+ @TableField(exist = false)
+ private String type;
+ @ApiModelProperty(value = "课程/疗愈id")
+ @TableField(exist = false)
+ private String uuid;
@ApiModelProperty(value = "购买内容-疗愈-所属分类名称")
@@ -136,14 +148,14 @@
@TableField(exist = false)
private String cellPhoneGive;
- @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单 4=充值")
+ @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单 4=充值 5=提现")
@TableField("order_from")
private Integer orderFrom;
@ApiModelProperty(value = "支付状态 1=待支付 2=已完成 3=已取消")
@TableField("payment_status")
private Integer paymentStatus;
- @ApiModelProperty(value = "支付方式 1微信 2支付宝 3余额 4内购 5微信+余额 6支付宝+余额 7内购加余额")
+ @ApiModelProperty(value = "支付方式 1微信 2支付宝 3内购 4余额 5微信+余额 6支付宝+余额 7内购加余额")
@TableField("pay_type")
private Integer payType;
@@ -202,6 +214,9 @@
@ApiModelProperty(value = "退款流水号")
@TableField("refund_code")
private String refundCode;
+ @ApiModelProperty(value = "退款备注")
+ @TableField("refund_remark")
+ private String refundRemark;
@ApiModelProperty(value = "退款业务订单号")
@TableField("refund_order_no")
private String refundOrderNo;
--
Gitblit v1.7.1