From d9d3e4edf8515d250337598c7d5b155ca7afb9c9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 26 七月 2023 09:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 dcd9be9..96f2359 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
@@ -3,15 +3,17 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.feignclient.other.model.StoreDetailList;
+import com.dsh.account.feignclient.other.model.StoreInfo;
import com.dsh.account.feignclient.other.model.SysNotice;
+import com.dsh.account.model.vo.classDetails.AppointmentRecordVo;
import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
import com.dsh.account.model.vo.classDetails.classInsVo.StuDetailsReq;
import com.dsh.account.model.vo.classDetails.classInsVo.StuListVo;
-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.exploreDetail.QuestionIns;
+import com.dsh.account.model.vo.exploreDetail.StoreDetailsVo;
import com.dsh.account.model.vo.sourceDetail.CouponStuAvailableVo;
import com.dsh.account.model.vo.sourceDetail.CourseDetailsOfContinuationResp;
import com.dsh.account.model.vo.sourceDetail.RecordTimeRequest;
@@ -29,7 +31,7 @@
*/
public interface TStudentService extends IService<TStudent> {
- void addStuOfAppUser(StuDetailsReq stu,Integer appUserId);
+ ResultUtil addStuOfAppUser(StuDetailsReq stu,Integer appUserId) throws Exception;
ClassDetailsInsVo querySessionDetailsDt(Integer userIdFormRedis, Integer lessonId, Integer stuId);
@@ -49,7 +51,7 @@
/**
* 查询常见问题列表
*/
- QuestionDetailsVo queryQuestionData();
+ List<QuestionIns> queryQuestionData();
/**
* 查询常见问题详情
@@ -64,7 +66,7 @@
/**
* 查询探索页面首页
*/
- ExploreDatasVo queryIndexOfExplores(LonLatRequest llrequest);
+ List<StoreInfo> queryIndexOfExplores(LonLatRequest llrequest);
/**
* 切换学员
@@ -73,4 +75,26 @@
ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request);
+ ResultUtil insertVipPaymentCallback(String outTradeNo, String transactionId);
+
+ /**
+ * 查询学院的上课记录
+ * @param stuId
+ * @param appUserId
+ * @return
+ */
+ AppointmentRecordVo getAppointmentRecords(Integer stuId, Integer appUserId);
+
+ ResultUtil cancelReservationOfCourse( Integer courseStuRecordId);
+
+ /**
+ *
+ * @param space 距离
+ * @param cityCode 城市code
+ * @return
+ */
+ List<StoreDetailList> queryStoreList(Integer space,String cityCode,String latitude,String longitude);
+
+ StoreDetailsVo getStoreDetail(Integer storeId);
+
}
--
Gitblit v1.7.1