From 0fe1f723f6fb85f25c945bd88c774f4a3142a818 Mon Sep 17 00:00:00 2001 From: lisy <linlangsur163@163.com> Date: 星期四, 03 八月 2023 11:52:19 +0800 Subject: [PATCH] 修复app端使用福利的课时详情接口;新增app端的编辑学员、设为默认接口 --- cloud-server-account/src/main/java/com/dsh/account/service/impl/TStudentServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 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 dea5145..6f670d5 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,5 +1,6 @@ package com.dsh.account.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsh.account.entity.Coach; @@ -25,6 +26,7 @@ import com.dsh.account.mapper.TStudentMapper; import com.dsh.account.model.vo.classDetails.AppointmentRecordVo; import com.dsh.account.model.vo.classDetails.ClasspaymentRequest; +import com.dsh.account.model.vo.classDetails.StuEditInfoReq; 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; @@ -218,6 +220,7 @@ @Override public List<PurchaseRecordVo> queryDeduRecordDetails(RecordTimeRequest timeRequest,Integer appUserId) { List<PurchaseRecordVo> purchaseRecordVoList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date startTime = DateTimeHelper.getCurrentIdetMouthStart(timeRequest.getStartTime()); Date endTime = DateTimeHelper.getCurrentIdeaMouthEnd(timeRequest.getEndTime()); GetStuSourseList getStuSourseList = new GetStuSourseList(); @@ -245,13 +248,15 @@ 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()); - IntrduceOfUserRequest request = new IntrduceOfUserRequest(); - request.setStartTime(startTime); - request.setEndTime(endTime); - request.setUserIds(userIds); - List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request); - purchaseRecordVoList.addAll(purchaseRecordVos1); + if (ToolUtil.isNotEmpty(tAppUsers)){ + List<Integer> userIds = tAppUsers.stream().map(TAppUser::getId).collect(Collectors.toList()); + IntrduceOfUserRequest request = new IntrduceOfUserRequest(); + request.setStartTime(startTime); + request.setEndTime(endTime); + request.setUserIds(userIds); + List<PurchaseRecordVo> purchaseRecordVos1 = idrClient.queryAppUsersofIntroduce(request); + purchaseRecordVoList.addAll(purchaseRecordVos1); + } if (purchaseRecordVoList.size() > 0 ){ purchaseRecordVoList = purchaseRecordVoList.stream() @@ -707,5 +712,30 @@ return detailsVo; } + @Override + public ResultUtil commitEditStudentInfo(StuEditInfoReq stu, Integer userIdFormRedis) { + TStudent tStudent = this.baseMapper.selectOne(new LambdaQueryWrapper<TStudent>() + .eq(TStudent::getId,stu.getId()) + .eq(TStudent::getAppUserId,userIdFormRedis)); + if (ToolUtil.isEmpty(tStudent)){ + ResultUtil.error("会员信息不存在!"); + } + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + tStudent.setHeadImg(stu.getHeadImg()); + tStudent.setName(stu.getName()); + tStudent.setPhone(ToolUtil.isEmpty(stu.getPhone()) ? "":stu.getPhone()); + try { + tStudent.setBirthday(simpleDateFormat.parse(stu.getBirthday())); + } catch (ParseException e) { + ResultUtil.runErr(); + } + tStudent.setSex(stu.getSex()); + tStudent.setHeight(stu.getHeight()); + tStudent.setWeight(stu.getWeight()); + tStudent.setIdCard(ToolUtil.isEmpty(stu.getIdCard()) ? "" : stu.getIdCard()); + this.baseMapper.updateById(tStudent); + return ResultUtil.success(); + } + } -- Gitblit v1.7.1