From aa0413f95fffba39cabcc78d147595da96b10b32 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 06 七月 2023 18:42:08 +0800
Subject: [PATCH] course：开始上课-已报名列表
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
index 8e4636e..3683a9d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java
@@ -7,6 +7,7 @@
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.activity.IntroduceRewardsClient;
import com.dsh.account.feignclient.activity.UserConponClient;
+import com.dsh.account.feignclient.activity.model.IntrduceOfUserRequest;
import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
import com.dsh.account.feignclient.competition.model.GetStuSourseList;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
@@ -38,7 +39,6 @@
import com.dsh.account.util.DateUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.ToolUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -140,7 +140,14 @@
getStuSourseList.setAppUserId(userIdFormRedis);
List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
purchaseRecordVoList.addAll(stuSourseList);
- List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+
+ GetStuSessionList sessionList = new GetStuSessionList();
+ sessionList.setStartTime(localMonthStart);
+ sessionList.setEndTime(localMonthEnd);
+ sessionList.setStuId(stuId);
+ sessionList.setAppUserId(userIdFormRedis);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(sessionList);
+
purchaseRecordVoList.addAll(cancelCourseList);
List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
purchaseRecordVoList.addAll(purchaseRecordVos);
@@ -148,7 +155,11 @@
.eq("referralUserId",userIdFormRedis )
.between("insertTime",localMonthStart ,localMonthEnd));
List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
- List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(localMonthStart, localMonthEnd, userIds);
+ IntrduceOfUserRequest request = new IntrduceOfUserRequest();
+ request.setStartTime(localMonthStart);
+ request.setEndTime(localMonthEnd);
+ request.setUserIds(userIds);
+ List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
purchaseRecordVoList.addAll(purchaseRecordVos1);
insVo.setSessionNames(stuSessionList);
insVo.setDetails(dealDataOfTime(purchaseRecordVoList));
@@ -159,7 +170,11 @@
insVo.setTotalNums(stuOfCoursesDetails.getTotalNums());
insVo.setDeductedNums(stuOfCoursesDetails.getDeductedNums());
insVo.setRemainingNums(stuOfCoursesDetails.getRemainingNums());
- Integer deductionClassHour = crClient.getDeductionClassHour(lessonId, stuId, userIdFormRedis);
+ GetStudentCourse course = new GetStudentCourse();
+ course.setCourseId(lessonId);
+ course.setStuId(stuId);
+ course.setAppUserId(userIdFormRedis);
+ Integer deductionClassHour = crClient.getDeductionClassHour(course);
insVo.setDeductionClassHours(deductionClassHour);
}
@@ -177,7 +192,14 @@
getStuSourseList.setAppUserId(appUserId);
List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(getStuSourseList);
purchaseRecordVoList.addAll(stuSourseList);
- List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(startTime,endTime,timeRequest.getStuId(),appUserId);
+
+ GetStuSessionList sessionList = new GetStuSessionList();
+ sessionList.setStartTime(startTime);
+ sessionList.setEndTime(endTime);
+ sessionList.setStuId(timeRequest.getStuId());
+ sessionList.setAppUserId(appUserId);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(sessionList);
+
purchaseRecordVoList.addAll(cancelCourseList);
GetStuSessionList getStuSessionList = new GetStuSessionList();
getStuSessionList.setStartTime(startTime);
@@ -190,7 +212,11 @@
.eq("referralUserId",appUserId )
.between("insertTime",startTime ,endTime));
List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
- List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(startTime, endTime, userIds);
+ IntrduceOfUserRequest request = new IntrduceOfUserRequest();
+ request.setStartTime(startTime);
+ request.setEndTime(endTime);
+ request.setUserIds(userIds);
+ List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request);
purchaseRecordVoList.addAll(purchaseRecordVos1);
purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
@@ -328,7 +354,7 @@
@Override
public ResultUtil renewClassPayment(Integer userIdFormRedis, ClasspaymentRequest request) {
- // TODO: 2023/7/5
+ // TODO: 2023/7/5 续课支付
switch (request.getPayType()){
case 1:
WeChatPayment();
--
Gitblit v1.7.1