From b85427676fedd373e955f24627764b8e5a29c816 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 01 三月 2024 17:10:28 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 9 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 5fa4ee6..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,8 +1,8 @@
package com.dsh.course.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
@@ -22,89 +22,179 @@
@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.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.NONE)
+ @TableField(updateStrategy = FieldStrategy.NEVER)
+ private Long id;
+ /**
+ * 业务编号
+ */
+ @TableField("code")
+ private String code;
/**
* 用户id
*/
+ @TableField("appUserId")
private Integer appUserId;
/**
* 学员id
*/
+ @TableField("studentId")
private Integer studentId;
/**
* 课包id
*/
+ @TableField("coursePackageId")
private Integer coursePackageId;
/**
- * 支付方式（1=现金，2=玩湃币）
+ * 支付方式（1=微信，2=支付宝，3=玩湃币,4=积分，5=积分+微信，6=积分+支付宝）
*/
- private String payType;
+ @TableField("payType")
+ private Integer payType;
/**
* 课时数
*/
+ @TableField("classHours")
private Integer classHours;
+ /**
+ * 原价
+ */
+ @TableField("originalPrice")
+ private Double originalPrice;
+ /**
+ * 优惠券id
+ */
+ @TableField("userCouponId")
+ private Long userCouponId;
/**
* 现金支付价格
*/
+ @TableField("cashPayment")
private BigDecimal cashPayment;
/**
- * 玩湃币价格
+ * 玩湃币价格/积分
*/
+ @TableField("playPaiCoin")
private Integer playPaiCoin;
/**
* 总课时
*/
+ @TableField("totalClassHours")
private Integer totalClassHours;
/**
* 剩余课时
*/
+ @TableField("laveClassHours")
private Integer laveClassHours;
/**
* 缺课次数
*/
+ @TableField("absencesNumber")
private Integer absencesNumber;
+ /**
+ * 退课课时
+ */
+ @TableField(exist = false)
+ private Integer dropoutsNumber;
/**
* 支付用户类型（1=用户，2=管理员）
*/
+ @TableField("payUserType")
private Integer payUserType;
/**
* 支付状态（1=待支付，2=已支付）
*/
+ @TableField("payStatus")
private Integer payStatus;
/**
* 第三方支付流水号
*/
+ @TableField("orderNumber")
private String orderNumber;
/**
* 支付用户id
*/
+ @TableField("payUserId")
private Integer payUserId;
/**
* 课程状态（1=正常，2=已退课）
*/
+ @TableField("status")
private Integer status;
/**
* 退课时间
*/
+ @TableField("withdrawalTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date withdrawalTime;
/**
* 退课凭证
*/
+ @TableField("certificate")
private String certificate;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
+ @TableField("state")
private Integer state;
/**
* 添加时间
*/
+ @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