From 8c55ab2701c99cec16eff92a26fefdf77fcdd28f Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期一, 25 九月 2023 16:17:44 +0800 Subject: [PATCH] app接口修改 --- cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 73 +++++++++++++++++++++++------------- 1 files changed, 46 insertions(+), 27 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java index 58c31cd..0f3ac1f 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java @@ -222,32 +222,36 @@ .eq("appUserId",appUserId )); System.out.println(tCoursePackagePayments); if (tCoursePackagePayments.size() > 0){ - for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { - TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId()); - Store store = stoClient.queryStoreById(coursePackage.getStoreId()); - RegisterCourseVo registerCourseVo = new RegisterCourseVo(); - // 2.0 - registerCourseVo.setType(coursePackage.getType()); + try { + for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) { + TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId()); + Store store = stoClient.queryStoreById(coursePackage.getStoreId()); + RegisterCourseVo registerCourseVo = new RegisterCourseVo(); + // 2.0 + registerCourseVo.setType(coursePackage.getType()); - registerCourseVo.setCoursePayId(tCoursePackagePayment.getId()); - registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId()); - registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId()); - registerCourseVo.setPackageImg(coursePackage.getCoverDrawing()); - String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")"; - registerCourseVo.setCourseNameStore(storeAndCourse); + registerCourseVo.setCoursePayId(tCoursePackagePayment.getId()); + registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId()); + registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId()); + registerCourseVo.setPackageImg(coursePackage.getCoverDrawing()); + String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")"; + registerCourseVo.setCourseNameStore(storeAndCourse); // registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime()); - // 2.0 - registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime())); - Coach coach = coachClient.queryCoachById(coursePackage.getCoachId()); - registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName()); - List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>() - .eq("coursePackageId",coursePackage.getId()) - .eq("studentId",appUserId )); - if (coursePackageStudents.size() > 0 ){ - registerCourseVo.setCourseNums(coursePackageStudents.size() * 2); + // 2.0 + registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime())); + Coach coach = coachClient.queryCoachById(coursePackage.getCoachId()); + registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName()); + List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>() + .eq("coursePackageId",coursePackage.getId()) + .eq("studentId",appUserId )); + if (coursePackageStudents.size() > 0 ){ + registerCourseVo.setCourseNums(coursePackageStudents.size() * 2); + } + registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus()); + courseVos.add(registerCourseVo); } - registerCourseVo.setPayStatus(tCoursePackagePayment.getPayStatus()); - courseVos.add(registerCourseVo); + }catch (Exception e){ + e.printStackTrace(); } if (ToolUtil.isNotEmpty(courseTypeId.getSearch())){ @@ -814,7 +818,7 @@ // 今天周几 int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1; - SimpleDateFormat format = new SimpleDateFormat("MM.dd"); + SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd"); ArrayList<String> strings1 = new ArrayList<>(); for (Integer integer : week) { @@ -913,7 +917,7 @@ return ResultUtil.error("当前课包课时数不足"); } tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours()-req.getNum()); - this.baseMapper.updateById(tCoursePackagePayment); + this.baseMapper.updateHoursById(tCoursePackagePayment.getId(),-req.getNum()); TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId()); @@ -970,7 +974,7 @@ student1.setReservationStatus(1); student1.setInsertTime(new Date()); cpsMapper.insert(student1); - } catch (ParseException e) { + } catch (Exception e) { e.printStackTrace(); } @@ -981,7 +985,7 @@ // 2.0 TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord(); tCourseInfoRecord.setUserId(userId); - tCourseInfoRecord.setCourseId(req.getOldCourseId()); + tCourseInfoRecord.setCourseId(req.getCourseId()); tCourseInfoRecord.setName("体验购课"); tCourseInfoRecord.setNum(req.getNum()); tCourseInfoRecord.setTime(new Date()); @@ -1009,5 +1013,20 @@ } + @Override + public void updateUseTime(Long id, Date date) { + this.baseMapper.updateUseTime(id,date); + } + + @Override + public List<Integer> getStudentIds(Integer payId) { + return this.baseMapper.getStudentIds(payId); + } + + @Override + public boolean updateHoursById(TCoursePackagePayment byId, int i) { + return this.baseMapper.updateHoursById(byId.getId(),i); + } + } -- Gitblit v1.7.1