From aa43a92c7ec9053dbaef92fe5ccb3011b670442c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 12 七月 2023 11:46:21 +0800
Subject: [PATCH] 更新线上视频奖励模块接口
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 143 +++++++++++++++++++++++++++++++++++------------
1 files changed, 106 insertions(+), 37 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 8704b59..4ab69ac 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,22 +7,21 @@
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.ParticipantClient;
+import com.dsh.account.feignclient.competition.model.GetStuSourseList;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+import com.dsh.account.feignclient.competition.model.SaveParticipant;
import com.dsh.account.feignclient.course.CancelListClient;
import com.dsh.account.feignclient.course.CoursePaymentClient;
import com.dsh.account.feignclient.course.CourseRecordClient;
import com.dsh.account.feignclient.course.CourseSessionNameClient;
-import com.dsh.account.feignclient.course.model.StuSessionDetailsVo;
-import com.dsh.account.feignclient.course.model.StuWithCoursesListVo;
-import com.dsh.account.feignclient.course.model.StudentOfCourseVo;
+import com.dsh.account.feignclient.course.model.*;
import com.dsh.account.feignclient.other.NoticeClient;
import com.dsh.account.feignclient.other.QuestionClient;
import com.dsh.account.feignclient.other.StoreClient;
-import com.dsh.account.feignclient.other.model.StoreDetailOfCourse;
-import com.dsh.account.feignclient.other.model.StoreInfo;
-import com.dsh.account.feignclient.other.model.StoreLonLatList;
-import com.dsh.account.feignclient.other.model.SysNotice;
+import com.dsh.account.feignclient.other.model.*;
import com.dsh.account.mapper.CoachMapper;
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
@@ -42,9 +41,9 @@
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;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -62,41 +61,47 @@
@Service
public class TStudentServiceImpl extends ServiceImpl<TStudentMapper, TStudent> implements TStudentService {
- @Autowired
+ @Resource
private CourseSessionNameClient sessionNameClient;
- @Autowired
+ @Resource
private DeductionCompetitionsClient dcttClient;
- @Autowired
+ @Resource
private CancelListClient cancelcClient;
- @Autowired
+ @Resource
private IntroduceRewardsClient idrClient;
- @Autowired
+ @Resource
private CourseRecordClient crClient;
- @Autowired
+ @Resource
private CoursePaymentClient couPayClient;
- @Autowired
+ @Resource
private UserConponClient userCClient;
- @Autowired
+ @Resource
private StoreClient storeClient;
- @Autowired
+ @Resource
private NoticeClient noClient;
- @Autowired
+ @Resource
private QuestionClient quesClient;
- @Autowired
+ @Resource
private TAppUserMapper tauMapper;
- @Autowired
+ @Resource
private CoachMapper coachMapper;
+
+ @Resource
+ private ParticipantClient participantClient;
+
+
+
@Override
public void addStuOfAppUser(StuDetailsReq stu,Integer appUserId) {
@@ -117,6 +122,18 @@
student.setInsertTime(new Date());
student.setState(1);
this.baseMapper.insert(student);
+
+ //同步信息到参赛人员信息中
+ SaveParticipant saveParticipant = new SaveParticipant();
+ saveParticipant.setAppUserId(appUserId);
+ saveParticipant.setName(student.getName());
+ saveParticipant.setBirthday(student.getBirthday());
+ saveParticipant.setGender(student.getSex());
+ saveParticipant.setHeight(student.getHeight().intValue());
+ saveParticipant.setWeight(student.getWeight());
+ saveParticipant.setPhone(student.getPhone());
+ saveParticipant.setIdcard(student.getIdCard());
+ participantClient.saveParticipant(saveParticipant);
}
@Override
@@ -124,7 +141,12 @@
ClassDetailsInsVo insVo = new ClassDetailsInsVo();
Date localMonthStart = DateTimeHelper.getCurrentMouthStart();
Date localMonthEnd = DateTimeHelper.getCurrentMouthEnd();
- List<StuSessionDetailsVo> stuSessionList = sessionNameClient.getStuSessionList(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+ GetStuSessionList getStuSessionList = new GetStuSessionList();
+ getStuSessionList.setStartTime(localMonthStart);
+ getStuSessionList.setEndTime(localMonthEnd);
+ getStuSessionList.setStuId(stuId);
+ getStuSessionList.setAppUserId(userIdFormRedis);
+ List<StuSessionDetailsVo> stuSessionList = sessionNameClient.getStuSessionList(getStuSessionList);
TStudent tStudent = this.baseMapper.selectById(stuId);
if (ToolUtil.isNotEmpty(tStudent)){
insVo.setStuId(tStudent.getId());
@@ -132,26 +154,47 @@
insVo.setStuImage(tStudent.getHeadImg());
List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>();
-
- List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(localMonthStart,localMonthEnd,userIdFormRedis);
+ GetStuSourseList getStuSourseList = new GetStuSourseList();
+ getStuSourseList.setStartTime(localMonthStart);
+ getStuSourseList.setEndTime(localMonthEnd);
+ 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(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+ List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
purchaseRecordVoList.addAll(purchaseRecordVos);
List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
.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));
- StuWithCoursesListVo stuOfCoursesDetails = couPayClient.getStuOfCoursesDetails(stuId, userIdFormRedis);
+ GetStuOfCoursesDetails getStuOfCoursesDetails = new GetStuOfCoursesDetails();
+ getStuOfCoursesDetails.setStuId(stuId);
+ getStuOfCoursesDetails.setAppUserId(userIdFormRedis);
+ StuWithCoursesListVo stuOfCoursesDetails = couPayClient.getStuOfCoursesDetails(getStuOfCoursesDetails);
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);
}
@@ -163,18 +206,37 @@
List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>();
Date startTime = DateTimeHelper.getCurrentIdetMouthStart(timeRequest.getStartTime());
Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(timeRequest.getEndTime());
-
- List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(startTime,endTime,appUserId);
+ GetStuSourseList getStuSourseList = new GetStuSourseList();
+ getStuSourseList.setStartTime(startTime);
+ getStuSourseList.setEndTime(endTime);
+ 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);
- List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(startTime,endTime,timeRequest.getStuId(),appUserId);
+ GetStuSessionList getStuSessionList = new GetStuSessionList();
+ getStuSessionList.setStartTime(startTime);
+ getStuSessionList.setEndTime(endTime);
+ getStuSessionList.setStuId(timeRequest.getStuId());
+ getStuSessionList.setAppUserId(appUserId);
+ List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(getStuSessionList);
purchaseRecordVoList.addAll(purchaseRecordVos);
List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
.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);
@@ -192,7 +254,11 @@
public CourseDetailsOfContinuationResp queryStuOfCourseDetails(Integer lessonId, Integer stuId, Integer appUserId) {
CourseDetailsOfContinuationResp resp = new CourseDetailsOfContinuationResp();
- StudentOfCourseVo studentCourse = couPayClient.getStudentCourse(lessonId,stuId,appUserId);
+ GetStudentCourse getStudentCourse = new GetStudentCourse();
+ getStudentCourse.setCourseId(lessonId);
+ getStudentCourse.setStuId(stuId);
+ getStudentCourse.setAppUserId(appUserId);
+ StudentOfCourseVo studentCourse = couPayClient.getStudentCourse(getStudentCourse);
resp.setCoursePackageId(studentCourse.getCoursePackageId());
resp.setStuId(stuId);
resp.setPackageImg(studentCourse.getPackageImg());
@@ -245,8 +311,11 @@
@Override
public ExploreDatasVo queryIndexOfExplores(LonLatRequest llrequest) {
ExploreDatasVo datasVo = new ExploreDatasVo();
- List<StoreInfo> allNearbyStoreList = storeClient.getAllNearbyStoreList(llrequest.getLongitude(),llrequest.getLatitude());
- List<StoreLonLatList> allStoreLonLats = storeClient.getAllStoreLonLats(llrequest.getLongitude(), llrequest.getLatitude());
+ GetAllNearbyStoreList getAllNearbyStoreList = new GetAllNearbyStoreList();
+ getAllNearbyStoreList.setLongitude(llrequest.getLongitude());
+ getAllNearbyStoreList.setLatitude(llrequest.getLatitude());
+ List<StoreInfo> allNearbyStoreList = storeClient.getAllNearbyStoreList(getAllNearbyStoreList);
+ List<StoreLonLatList> allStoreLonLats = storeClient.getAllStoreLonLats(getAllNearbyStoreList);
datasVo.setStoreLists(allNearbyStoreList);
datasVo.setLonLatLists(allStoreLonLats);
return datasVo;
@@ -305,7 +374,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