From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 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..96b44df 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
@@ -1,9 +1,8 @@
package com.dsh.course.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -23,13 +22,14 @@
@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;
/**
* 主键
*/
@TableId(value = "id", type = IdType.NONE)
+ @TableField(updateStrategy = FieldStrategy.NEVER)
private Long id;
/**
* 业务编号
@@ -52,7 +52,7 @@
@TableField("coursePackageId")
private Integer coursePackageId;
/**
- * 支付方式（1=微信，2=支付宝，3=玩湃币）
+ * 支付方式（1=微信，2=支付宝，3=玩湃币,4=积分，5=积分+微信，6=积分+支付宝）
*/
@TableField("payType")
private Integer payType;
@@ -77,7 +77,7 @@
@TableField("cashPayment")
private BigDecimal cashPayment;
/**
- * 玩湃币价格
+ * 玩湃币价格/积分
*/
@TableField("playPaiCoin")
private Integer playPaiCoin;
@@ -96,6 +96,11 @@
*/
@TableField("absencesNumber")
private Integer absencesNumber;
+ /**
+ * 退课课时
+ */
+ @TableField(exist = false)
+ private Integer dropoutsNumber;
/**
* 支付用户类型（1=用户，2=管理员）
*/
@@ -125,6 +130,7 @@
* 退课时间
*/
@TableField("withdrawalTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date withdrawalTime;
/**
* 退课凭证
@@ -140,6 +146,55 @@
* 添加时间
*/
@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;
+
+ /**
+ * 平台手动支付时使用
+ */
+ @TableField("payUserName")
+ private String payUserName;
+ /**
+ * 销售人员(线下购课添加购课订单时使用)
+ */
+ @TableField("salesName")
+ private String salesName;
+
+ @TableField(exist = false)
+ private String studentName;
+ @TableField(exist = false)
+
+ private String province;
+ @TableField(exist = false)
+
+ private String city;
+ @TableField(exist = false)
+
+ private String courseName;
+ @TableField(exist = false)
+
+ private Integer hasHours;
+ @TableField(exist = false)
+
+ private BigDecimal laveCashPayment;
+ @TableField(exist = false)
+
+ private BigDecimal cashPayment1;
+
+
+ @TableField(exist = false)
+ private Integer type;
+
+ @TableField(exist = false)
+ private Integer orderId;
+ @TableField("giftClassHours")
+ private Integer giftClassHours;
+ // 所选课时规格id
+ @TableField(exist = false)
+ private Integer coursePackageConfigId;
}
--
Gitblit v1.7.1