From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突
---
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index e8c837b..e121355 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -1,7 +1,20 @@
package com.dsh.account.service;
+import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.account.entity.TStudent;
-import com.baomidou.mybatisplus.service.IService;
+import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.feignclient.other.model.SysNotice;
+import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
+import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
+import com.dsh.account.model.vo.exploreDetail.ExploreDatasVo;
+import com.dsh.account.model.vo.exploreDetail.LonLatRequest;
+import com.dsh.account.model.vo.exploreDetails.QuestionDetailsVo;
+import com.dsh.account.model.vo.exploreDetails.QuestionIns;
+import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
+import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
+import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +26,41 @@
*/
public interface TStudentService extends IService<TStudent> {
+ void addStuOfAppUser(StuDetailsReq stu,Integer appUserId);
+
+ ClassDetailsInsVo querySessionDetailsDt(Integer userIdFormRedis, Integer lessonId, Integer stuId);
+
+ List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId);
+
+ List<CouponStuAvailableVo> queryStuOfConponDetails(Integer appUserId);
+
+ CourseDetailsOfContinuationResp queryStuOfCourseDetails(Integer lessonId, Integer stuId, Integer appUserId);
+ /**
+ * 查询探索-公告列表
+ */
+ List<SysNotice> querySystemNoticeDetails();
+ /**
+ * 查询公告详情
+ */
+ SysNotice queryNoticeData(Integer noId);
+ /**
+ * 查询常见问题列表
+ */
+ QuestionDetailsVo queryQuestionData();
+
+ /**
+ * 查询常见问题详情
+ */
+ QuestionIns queryQuestionDataInfo(Integer quesId);
+
+ /**
+ * 查询客服列表
+ */
+ List<String> queryCustomerDetails();
+
+ /**
+ * 查询探索页面首页
+ */
+ ExploreDatasVo queryIndexOfExplores(LonLatRequest llrequest);
+
}
--
Gitblit v1.7.1