From c0f6294b0be6789fddd652f89f820fcf6d5526cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:32:39 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/entity/TCoursePackagePayment.java | 26 +++++++++++++++++++-------
1 files changed, 19 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 ce1e4c1..743d2de 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,14 +1,14 @@
package com.dsh.course.entity;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* <p>
@@ -23,13 +23,17 @@
@Accessors(chain = true)
@TableName("t_course_package_payment")
public class TCoursePackagePayment {
-
+ private static final long serialVersionUID = 1L;
/**
* 主键
*/
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.INPUT)
+ private Long id;
+ /**
+ * 业务编号
+ */
+ private String code;
/**
* 用户id
*/
@@ -43,7 +47,7 @@
*/
private Integer coursePackageId;
/**
- * 支付方式（1=现金，2=玩湃币）
+ * 支付方式（1=微信，2=支付宝，3=玩湃币）
*/
private Integer payType;
/**
@@ -51,6 +55,14 @@
*/
private Integer classHours;
/**
+ * 原价
+ */
+ private Double originalPrice;
+ /**
+ * 优惠券id
+ */
+ private Long userCouponId;
+ /**
* 现金支付价格
*/
private BigDecimal cashPayment;
--
Gitblit v1.7.1