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 | 146 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 142 insertions(+), 4 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 5b93fb4..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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinquan.common.core.web.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,21 +37,127 @@
@TableField("biz_order_no")
private String bizOrderNo;
+ @ApiModelProperty(value = "第三方业务流水号 前端忽略")
+ @TableField(exist = false)
+ private String payOrderNo;
+ @ApiModelProperty(value = "uid")
+ @TableField(exist = false)
+ private String uid;
+ @ApiModelProperty(value = "备注 前端忽略")
+ @TableField(exist = false)
+ private String remark;
+ @ApiModelProperty(value = "余额支付金额 前端忽略")
+ @TableField(exist = false)
+ private BigDecimal balance;
+ @ApiModelProperty(value = "用户名称")
+ @TableField(exist = false)
+ private String userName;
+ @ApiModelProperty(value = "用户手机号")
+ @TableField(exist = false)
+ private String cellPhone;
+ @ApiModelProperty(value = "用户头像")
+ @TableField(exist = false)
+ private String avatar;
+
+ @ApiModelProperty(value = "购买内容-课程-所属分类名称")
+ @TableField(exist = false)
+ private String categoryCourseName;
+ @ApiModelProperty(value = "购买内容-课程-课程标题")
+ @TableField(exist = false)
+ private String courseTitle;
+ @ApiModelProperty(value = "购买内容-课程-封面图")
+ @TableField(exist = false)
+ private String coverUrl;
+ @ApiModelProperty(value = "购买内容-课程-导师")
+ @TableField(exist = false)
+ private String tutor;
+ @ApiModelProperty(value = "购买内容-课程-章节数")
+ @TableField(exist = false)
+ private Long courseChapterCount;
+ @ApiModelProperty(value = "购买内容-课程-价格")
+ @TableField(exist = false)
+ private BigDecimal generalPriceCourse;
+ @ApiModelProperty(value = "购买内容-课程-上架状态 1上架2下架")
+ @TableField(exist = false)
+ private Integer listingStatusCourse;
+ @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 = "购买内容-疗愈-所属分类名称")
+ @TableField(exist = false)
+ private String categoryMeditationName;
+ @ApiModelProperty(value = "购买内容-疗愈-疗愈标题")
+ @TableField(exist = false)
+ private String meditationTitle;
+ @ApiModelProperty(value = "购买内容-疗愈-icon")
+ @TableField(exist = false)
+ private String iconUrl;
+ @ApiModelProperty(value = "购买内容-疗愈-描述文案")
+ @TableField(exist = false)
+ private String detailDescription;
+ @ApiModelProperty(value = "购买内容-疗愈-价格")
+ @TableField(exist = false)
+ private BigDecimal generalPriceMeditation;
+ @ApiModelProperty(value = "购买内容-疗愈-上架状态 1上架2下架")
+ @TableField(exist = false)
+ private Integer listingStatusMeditation;
+ @ApiModelProperty(value = "购买内容-疗愈-meditationUid")
+ @TableField(exist = false)
+ private String meditationUid;
+
+
+ @ApiModelProperty(value = "购买内容-会员-会员类型")
+ @TableField(exist = false)
+ private String vipType;
+ @ApiModelProperty(value = "购买内容-会员-价格")
+ @TableField(exist = false)
+ private BigDecimal generalPriceVip;
+
+
+ @ApiModelProperty(value = "购买内容")
+ @TableField("buy_content")
+ private String buyContent;
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
-
- @ApiModelProperty(value = "购买商品id")
+ @ApiModelProperty(value = "购买商品id/购买内容id")
@TableField("business_id")
private Long businessId;
+ @ApiModelProperty(value = "被赠送用户id")
+ @TableField("give_user_id")
+ private Long giveUserId;
- @ApiModelProperty(value = "订单类型 1=冥想订单 2=课程订单 3=会员订单")
+ @ApiModelProperty(value = "被赠送用户头像")
+ @TableField(exist = false)
+ private String avatarGive;
+ @ApiModelProperty(value = "被赠送用户名称")
+ @TableField(exist = false)
+ private String userNameGive;
+ @ApiModelProperty(value = "被赠送用户电话")
+ @TableField(exist = false)
+ private String cellPhoneGive;
+
+ @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内购加余额")
+ @TableField("pay_type")
+ private Integer payType;
@ApiModelProperty(value = "总金额")
@TableField("total_amount")
@@ -64,25 +171,56 @@
@TableField("commission_amount")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "获得分佣的用户id")
+ @TableField("commission_id")
+ private Long commissionId;
+
@ApiModelProperty(value = "改价金额")
@TableField("change_price")
private BigDecimal changePrice;
+ @ApiModelProperty(value = "平台总收益")
+ @TableField(exist = false)
+ private BigDecimal platformMoney;
@ApiModelProperty(value = "改价时间")
@TableField("change_price_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime changePriceTime;
@ApiModelProperty(value = "改价人id")
@TableField("change_price_operator")
private Long changePriceOperator;
-
+ @ApiModelProperty(value = "改价人名称")
+ @TableField(exist = false)
+ private String changePriceOperatorName;
+ @ApiModelProperty(value = "付款方式 微信(￥10.00) + 余额(￥100.00)")
+ @TableField(exist = false)
+ private String paymentType;
@ApiModelProperty(value = "付款时间")
@TableField("payment_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime paymentTime;
@ApiModelProperty(value = "取消时间")
@TableField("cancel_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private LocalDateTime cancelTime;
+ @ApiModelProperty(value = "退款时间")
+ @TableField("refund_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ private LocalDateTime refundTime;
+ @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;
+ @ApiModelProperty(value = "退款状态 1未退款 2退款中 3退款成功")
+ @TableField("refund_status")
+ private Integer refundStatus;
}
--
Gitblit v1.7.1