From 5a7de6a73c756ae8e7af2b3e002d6fb52c5cf04c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 10 十月 2023 16:26:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java | 2 ++
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java
index bf73e76..4e76a12 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/CoursePackageInfo.java
@@ -47,4 +47,6 @@
private Integer type;
@ApiModelProperty("假期有效期")
private String time;
+
+ private Integer isVip;
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index e3932d7..c93933c 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -486,6 +486,7 @@
AppUser appUser = appUserClient.queryAppUser(uid);
TCoursePackage coursePackage = this.getById(id);
CoursePackageInfo coursePackageInfo = new CoursePackageInfo();
+ coursePackageInfo.setIsVip(appUser.getIsVip());
coursePackageInfo.setId(id);
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
if(coursePackage.getType()==2){
--
Gitblit v1.7.1