From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
index 767adbd..7592fa6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -23,7 +25,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_course_package_payment")
-public class TCoursePackagePayment {
+public class TCoursePackagePayment extends Model<TCoursePackagePayment>{
private static final long serialVersionUID = 1L;
/**
@@ -52,7 +54,7 @@
@TableField("coursePackageId")
private Integer coursePackageId;
/**
- * 支付方式（1=微信，2=支付宝，3=玩湃币）
+ * 支付方式（1=微信，2=支付宝，3=玩湃币,4=积分，5=积分+微信，6=积分+支付宝）
*/
@TableField("payType")
private Integer payType;
@@ -77,7 +79,7 @@
@TableField("cashPayment")
private BigDecimal cashPayment;
/**
- * 玩湃币价格
+ * 玩湃币价格/积分
*/
@TableField("playPaiCoin")
private Integer playPaiCoin;
@@ -96,6 +98,11 @@
*/
@TableField("absencesNumber")
private Integer absencesNumber;
+ /**
+ * 退课课时
+ */
+ @TableField(exist = false)
+ private Integer dropoutsNumber;
/**
* 支付用户类型（1=用户，2=管理员）
*/
@@ -125,6 +132,7 @@
* 退课时间
*/
@TableField("withdrawalTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date withdrawalTime;
/**
* 退课凭证
@@ -140,6 +148,11 @@
* 添加时间
*/
@TableField("insertTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date insertTime;
+
+ @TableField("useTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date useTime;
}
--
Gitblit v1.7.1