From 75d8795d4a8444071f348be4082455f2ca078ffe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:28:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/model/PaymentCourseVo.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/PaymentCourseVo.java b/cloud-server-course/src/main/java/com/dsh/course/model/PaymentCourseVo.java
index 3d8757d..0982f8e 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/PaymentCourseVo.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/PaymentCourseVo.java
@@ -15,7 +15,7 @@
private Integer id;
@ApiModelProperty(value = "支付方式（1=微信，2=支付宝，3=玩湃币）", dataType = "int", required = true)
private Integer payType;
- @ApiModelProperty(value = "支付金额", dataType = "double", required = true)
+ @ApiModelProperty(value = "支付金额（不使用优惠券的价格）", dataType = "double", required = true)
private Double price;
@ApiModelProperty(value = "课时id", dataType = "int", required = true)
private Integer coursePackagePaymentConfigId;
@@ -23,4 +23,6 @@
private String studentIds;
@ApiModelProperty(value = "优惠券id", dataType = "long", required = false)
private Long couponId;
+ @ApiModelProperty(value = "订单id", dataType = "int", required = false)
+ private Long orderId;
}
--
Gitblit v1.7.1