From 1370d46d24c8ab9b6dc27305a17661ee6a706b60 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期三, 05 七月 2023 15:17:14 +0800 Subject: [PATCH] account模块:教练实体类、课时续课详情 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 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 dc7cee2..7e7f9da 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dsh.account.entity.Coach; import com.dsh.account.entity.TAppUser; import com.dsh.account.entity.TStudent; import com.dsh.account.feignclient.activity.IntroduceRewardsClient; @@ -22,10 +23,12 @@ 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.CoachMapper; 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.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; @@ -35,6 +38,7 @@ 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.DateUtil; import com.dsh.account.util.ToolUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -88,6 +92,9 @@ @Autowired private TAppUserMapper tauMapper; + + @Autowired + private CoachMapper coachMapper; @Override public void addStuOfAppUser(StuDetailsReq stu,Integer appUserId) { @@ -163,7 +170,7 @@ purchaseRecordVoList.addAll(purchaseRecordVos); List<TAppUser> tAppUsers = tauMapper.selectList(new QueryWrapper<TAppUser>() .eq("referralUserId",appUserId ) - .between("insertTime",timeRequest.getStartTime() ,timeRequest.getEndTime())); + .between("insertTime",startTime ,endTime)); List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()); List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(startTime, endTime, userIds); purchaseRecordVoList.addAll(purchaseRecordVos1); @@ -184,9 +191,27 @@ CourseDetailsOfContinuationResp resp = new CourseDetailsOfContinuationResp(); StudentOfCourseVo studentCourse = couPayClient.getStudentCourse(lessonId,stuId,appUserId); + resp.setCoursePackageId(studentCourse.getCoursePackageId()); + resp.setStuId(stuId); + resp.setPackageImg(studentCourse.getPackageImg()); + resp.setCourseName(studentCourse.getCourseName()); + Coach coach = coachMapper.selectById(studentCourse.getCoachId()); + resp.setTeacherName(coach.getName()); + resp.setCourseWeek(studentCourse.getCourseWeek()); + resp.setCourseTime(studentCourse.getCourseTime()); StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(studentCourse.getStoreId()); + resp.setStoreName(courseOfStore.getStoreName()); + resp.setStoreAddr(courseOfStore.getStoreAddr()); + resp.setTypeList(studentCourse.getTypeList()); + TStudent tStudent = this.baseMapper.selectById(stuId); + resp.setStuName(tStudent.getName()); + resp.setStuPhone(tStudent.getPhone()); + resp.setStuAge(DateUtil.age(tStudent.getBirthday())); + resp.setAmount(studentCourse.getAmount()); + resp.setVipAmount(studentCourse.getVipAmount()); + resp.setWpGold(studentCourse.getWpGold()); return resp; } @@ -225,6 +250,36 @@ return datasVo; } + @Override + public List<StuListVo> switchStudentActions(Integer appUserId, Integer stuId) { + List<StuListVo> stuListVos = new ArrayList<>(); + List<TStudent> tStudents = this.baseMapper.selectList(new QueryWrapper<TStudent>() + .eq("appUserId", appUserId) + .eq("state",1)); + if (tStudents.size() > 0) { + tStudents.forEach(sts -> { + if (Objects.equals(sts.getId(), stuId)) { + sts.setIsDefault(1); + } else { + sts.setIsDefault(2); + } + this.baseMapper.updateById(sts); + + StuListVo vo = new StuListVo(); + vo.setStuId(sts.getId()); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + vo.setBirthday(simpleDateFormat.format(sts.getBirthday())); + vo.setStuName(sts.getName()); + vo.setStuAge(DateUtil.age(sts.getBirthday())); + vo.setStuHeight(sts.getHeight()); + vo.setStuWeight(sts.getWeight()); + vo.setIsNot(sts.getIsDefault()); + stuListVos.add(vo); + }); + } + return stuListVos; + } + public static List<PurchaseRecordVo> dealDataOfTime(List<PurchaseRecordVo> purchaseRecords) { Collections.sort(purchaseRecords, new Comparator<PurchaseRecordVo>() { -- Gitblit v1.7.1