From 60ef8b4a95540dfab9df0447364ee40c18354010 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 208 insertions(+), 4 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 bd7438f..dc7cee2 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
@@ -1,15 +1,49 @@
package com.dsh.account.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.TAppUser;
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.competition.DeductionCompetitionsClient;
+import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
+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.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.mapper.TAppUserMapper;
import com.dsh.account.mapper.TStudentMapper;
+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 com.dsh.account.service.TStudentService;
-
+import com.dsh.account.util.DateTimeHelper;
+import com.dsh.account.util.ToolUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.Date;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -22,15 +56,48 @@
@Service
public class TStudentServiceImpl extends ServiceImpl<TStudentMapper, TStudent> implements TStudentService {
+ @Autowired
+ private CourseSessionNameClient sessionNameClient;
+
+ @Autowired
+ private DeductionCompetitionsClient dcttClient;
+
+ @Autowired
+ private CancelListClient cancelcClient;
+
+ @Autowired
+ private IntroduceRewardsClient idrClient;
+
+ @Autowired
+ private CourseRecordClient crClient;
+
+ @Autowired
+ private CoursePaymentClient couPayClient;
+
+ @Autowired
+ private UserConponClient userCClient;
+
+ @Autowired
+ private StoreClient storeClient;
+
+ @Autowired
+ private NoticeClient noClient;
+
+ @Autowired
+ private QuestionClient quesClient;
+
+ @Autowired
+ private TAppUserMapper tauMapper;
+
@Override
public void addStuOfAppUser(StuDetailsReq stu,Integer appUserId) {
TStudent student = new TStudent();
student.setAppUserId(appUserId);
student.setName(stu.getName());
student.setHeadImg(stu.getHeadImg());
- student.setPhone(stu.getPhone());
+ student.setPhone(ToolUtil.isNotEmpty(stu.getPhone()) ? stu.getPhone() : "");
student.setSex(stu.getSex());
- student.setIdCard(stu.getIdCard());
+ student.setIdCard(ToolUtil.isNotEmpty(stu.getIdCard())?stu.getIdCard() : "");
student.setBirthday(new Date(stu.getBirthday()));
student.setHeight(stu.getHeight());
student.setWeight(stu.getWeight());
@@ -42,4 +109,141 @@
student.setState(1);
this.baseMapper.insert(student);
}
+
+ @Override
+ public ClassDetailsInsVo querySessionDetailsDt(Integer userIdFormRedis, Integer lessonId, Integer stuId) {
+ ClassDetailsInsVo insVo = new ClassDetailsInsVo();
+ Date localMonthStart = DateTimeHelper.getCurrentMouthStart();
+ Date localMonthEnd = DateTimeHelper.getCurrentMouthEnd();
+ List<StuSessionDetailsVo> stuSessionList = sessionNameClient.getStuSessionList(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+ TStudent tStudent = this.baseMapper.selectById(stuId);
+ if (ToolUtil.isNotEmpty(tStudent)){
+ insVo.setStuId(tStudent.getId());
+ insVo.setStuName(tStudent.getName());
+ insVo.setStuImage(tStudent.getHeadImg());
+
+ List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>();
+
+ List<PurchaseRecordVo> stuSourseList = dcttClient.getStuSourseList(localMonthStart,localMonthEnd,userIdFormRedis);
+ purchaseRecordVoList.addAll(stuSourseList);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+ purchaseRecordVoList.addAll(cancelCourseList);
+ List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(localMonthStart,localMonthEnd,stuId,userIdFormRedis);
+ 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);
+ purchaseRecordVoList.addAll(purchaseRecordVos1);
+ insVo.setSessionNames(stuSessionList);
+ insVo.setDetails(dealDataOfTime(purchaseRecordVoList));
+ StuWithCoursesListVo stuOfCoursesDetails = couPayClient.getStuOfCoursesDetails(stuId, userIdFormRedis);
+ insVo.setTotalNums(stuOfCoursesDetails.getTotalNums());
+ insVo.setDeductedNums(stuOfCoursesDetails.getDeductedNums());
+ insVo.setRemainingNums(stuOfCoursesDetails.getRemainingNums());
+ Integer deductionClassHour = crClient.getDeductionClassHour(lessonId, stuId, userIdFormRedis);
+ insVo.setDeductionClassHours(deductionClassHour);
+ }
+
+ return insVo;
+ }
+
+ @Override
+ public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId) {
+ 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);
+ purchaseRecordVoList.addAll(stuSourseList);
+ List<PurchaseRecordVo> cancelCourseList = cancelcClient.getCancelCourseList(startTime,endTime,timeRequest.getStuId(),appUserId);
+ purchaseRecordVoList.addAll(cancelCourseList);
+ List<PurchaseRecordVo> purchaseRecordVos = sessionNameClient.queryCourseDetails(startTime,endTime,timeRequest.getStuId(),appUserId);
+ purchaseRecordVoList.addAll(purchaseRecordVos);
+ List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>()
+ .eq("referralUserId",appUserId )
+ .between("insertTime",timeRequest.getStartTime() ,timeRequest.getEndTime()));
+ List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList());
+ List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(startTime, endTime, userIds);
+ purchaseRecordVoList.addAll(purchaseRecordVos1);
+
+ purchaseRecordVoList = dealDataOfTime(purchaseRecordVoList);
+ return purchaseRecordVoList;
+ }
+
+ @Override
+ public List<CouponStuAvailableVo> queryStuOfConponDetails(Integer appUserId) {
+ List<CouponStuAvailableVo> availableVos = new ArrayList<>();
+ availableVos = userCClient.queryUserWithConponList(appUserId);
+ return availableVos;
+ }
+
+ @Override
+ public CourseDetailsOfContinuationResp queryStuOfCourseDetails(Integer lessonId, Integer stuId, Integer appUserId) {
+ CourseDetailsOfContinuationResp resp = new CourseDetailsOfContinuationResp();
+
+ StudentOfCourseVo studentCourse = couPayClient.getStudentCourse(lessonId,stuId,appUserId);
+
+ StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(studentCourse.getStoreId());
+
+ return resp;
+ }
+
+ @Override
+ public List<SysNotice> querySystemNoticeDetails() {
+ return noClient.getSysNoticeDetails();
+ }
+
+ @Override
+ public SysNotice queryNoticeData(Integer noId) {
+ return noClient.getSysNoticeBuId(noId);
+ }
+
+ @Override
+ public QuestionDetailsVo queryQuestionData() {
+ return quesClient.getSysQuestionDetails();
+ }
+
+ @Override
+ public QuestionIns queryQuestionDataInfo(Integer quesId) {
+ return quesClient.getSysQuestionBuId(quesId);
+ }
+
+ @Override
+ public List<String> queryCustomerDetails() {
+ return noClient.queryCustomerTel();
+ }
+
+ @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());
+ datasVo.setStoreLists(allNearbyStoreList);
+ datasVo.setLonLatLists(allStoreLonLats);
+ return datasVo;
+ }
+
+
+ public static List<PurchaseRecordVo> dealDataOfTime(List<PurchaseRecordVo> purchaseRecords) {
+ Collections.sort(purchaseRecords, new Comparator<PurchaseRecordVo>() {
+ @Override
+ public int compare(PurchaseRecordVo record1, PurchaseRecordVo record2) {
+ SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
+ Date date1 = null;
+ Date date2 = null;
+ try {
+ date1 = dateFormat.parse(record1.getPurchaseTime());
+ date2 = dateFormat.parse(record2.getPurchaseTime());
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ // 倒序排序
+ return date2.compareTo(date1);
+ }
+ });
+ return purchaseRecords;
+ }
+
}
--
Gitblit v1.7.1