From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 05 二月 2024 11:56:52 +0800 Subject: [PATCH] 更新bug修改 --- cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 267 +++++++++++++++------------------------------------- 1 files changed, 79 insertions(+), 188 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java index 565114e..d7630ef 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java +++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java @@ -138,6 +138,12 @@ @Autowired private ICoursePackageOrderStudentService coursePackageOrderStudentService; + @Autowired + private ALiSendSms aLiSendSms; + + @Resource + private AppUserClient appuClient; + /** * 查询学员入学时间 根据第一次购买课包的时间 @@ -180,11 +186,12 @@ coursePackageOrder.setStudentIds(String.valueOf(packagePayment.getStudentId())); coursePackageOrder.setCoursePackageId(packagePayment.getCoursePackageId()); coursePackageOrder.setClassHours(packagePayment.getClassHours()); - coursePackageOrder.setLaveClassHours(packagePayment.getClassHours()); coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice()); coursePackageOrder.setCashPayment(packagePayment.getCashPayment()); coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin()); + coursePackageOrder.setCode(packagePayment.getCode()); coursePackageOrder.setPayStatus(1); + coursePackageOrder.setStatus(1); coursePackageOrder.setState(1); coursePackageOrder.setInsertTime(new Date()); coursePackageOrder.setSalesName(packagePayment.getSalesName()); @@ -471,7 +478,8 @@ } } TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId()); - Student student = studentClient.queryStudentById(re.getStudentId()); + String[] split = re.getStudentIds().split(","); + Student student = studentClient.queryStudentById(Integer.valueOf(split[0])); re.setPayStudent(student.getName()); re.setPayUser(appUser.getName()); re.setPhone(appUser.getPhone()); @@ -760,7 +768,6 @@ return lisco; } - @PostMapping("/base/coursePack/continuingCourse") public StudentOfCourseVo getStudentCourse(@RequestBody GetStudentCourse getStudentCourse) { StudentOfCourseVo courseVo = new StudentOfCourseVo(); @@ -769,7 +776,6 @@ .eq("coursePackageId", getStudentCourse.getCourseId()) .eq("studentId", getStudentCourse.getStuId())); if (tCoursePackagePayments.size() > 0) { - List<CourseHoursType> typeList = new ArrayList<>(); tCoursePackagePayments.forEach(cou -> { CourseHoursType hoursType = new CourseHoursType(); @@ -780,7 +786,6 @@ TCoursePackagePayment tCoursePackagePayment = tCoursePackagePayments.get(0); courseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId()); courseVo.setTypeList(typeList); - TCoursePackage coursePackage = tcpService.getById(tCoursePackagePayment.getCoursePackageId()); courseVo.setPackageImg(coursePackage.getCoverDrawing()); courseVo.setCourseName(coursePackage.getName()); @@ -1163,15 +1168,15 @@ }) public ResultUtil continuationOperation(ClasspaymentRequest request) { try { - Integer userIdFormRedis = tokenUtil.getUserIdFormRedis(); - if (null == userIdFormRedis) { + Integer userId = tokenUtil.getUserIdFormRedis(); + if (null == userId) { return ResultUtil.tokenErr(); } Integer couponId = request.getConponId(); if (couponId == null || couponId == 0) { request.setConponId(null); } - return packagePaymentService.ContinuationOrpaymentCourse(userIdFormRedis, request); + return packagePaymentService.ContinuationOrpaymentCourse(userId, request); } catch (Exception e) { return ResultUtil.runErr(); } @@ -1298,21 +1303,16 @@ @PostMapping("/coursePackagePayment/paymentDeductionClassHour") public void paymentDeductionClassHour(@RequestBody PaymentDeductionClassHour paymentDeductionClassHour) { try { - // 2.0 用id进行查询 -// TCoursePackagePayment coursePackagePayment = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("id", paymentDeductionClassHour.getCourseId()).eq("payStatus", 2) -// .eq("status", 1).eq("state", 1).gt("laveClassHours", 0)); -// Integer classHour = paymentDeductionClassHour.getClassHour(); -// for (TCoursePackagePayment coursePackagePayment : list) { - - - CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getById(paymentDeductionClassHour.getCourseId()); -// if (paymentDeductionClassHour.getClassHour() > coursePackageOrderStudent.getLaveClassHours()) { -// return ResultUtil.error("当前课包课时数不足"); -// } TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId()); coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() - paymentDeductionClassHour.getClassHour()); coursePackageOrderStudentService.updateById(coursePackageOrderStudent); + Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours(); + if(3 >= laveClassHours){ + AppUser appUser = appuClient.queryAppUser(coursePackageOrderStudent.getAppUserId()); + //发送短信提醒 + aLiSendSms.sendSms(appUser.getPhone(), "SMS_463646317", ""); + } //判断剩余课时是否已经全部进行排课,如果排课需要删除已经排好的记录 List<CoursePackageScheduling> list1 = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>() .eq("studentId", coursePackageOrderStudent.getStudentId()).eq("status", 1) @@ -1332,131 +1332,14 @@ } } - - - - - -// if (coursePackagePayment.getLaveClassHours().compareTo(classHour) >= 0) { -// coursePackagePayment.setLaveClassHours(coursePackagePayment.getLaveClassHours() - classHour); -// coursePackagePayment.setAppUserId(null); -// packagePaymentService.updateById(coursePackagePayment); -// -// CourseCounsum courseCounsum = new CourseCounsum(); -// courseCounsum.setPaymentId(coursePackagePayment.getId()); -// courseCounsum.setChangeType(0); -// courseCounsum.setNum(classHour); -// courseCounsum.setInsertTime(new Date()); -// courseCounsum.setReason("报名赛事"); -// courseCounsumService.save(courseCounsum); -// -// -// List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackagePayment.getStudentId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId())); -// List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList()); -// coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect)); -// coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", paymentDeductionClassHour.getId()).eq("coursePackageId", coursePackagePayment.getCoursePackageId())); -// -// -// TCoursePackage tCoursePackage = packageService.getById(coursePackagePayment.getCoursePackageId()); -// String classWeeks = tCoursePackage.getClassWeeks(); -// List<Integer> week = week(classWeeks); -// -// TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackagePayment.getCoursePackageId()).eq("studentId", coursePackagePayment.getStudentId())); -// -// Date today = new Date(); -// Calendar calendar = Calendar.getInstance(); -// calendar.add(Calendar.DATE, -1); -// today = calendar.getTime(); -// -// -// Integer laveClassHours = pay.getLaveClassHours(); -// Integer codeTime = tCoursePackage.getCodeTime(); -// Integer can = laveClassHours / codeTime; -// -// int count = 0; -// String[] split = tCoursePackage.getClassStartTime().split(","); -// String[] split1 = tCoursePackage.getClassEndTime().split(","); -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); -// SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); -// -// Date[] dates = generateDateArray(14, today); -// for (Date date : dates) { -// if (count == can) { -// break; -// } -// int wei = cn.hutool.core.date.DateUtil.dayOfWeek(date); -// if (week.contains(wei)) { -// for (int i1 = 0; i1 < split.length; i1++) { -// if (count == can) { -// break; -// } -// CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling(); -// coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); -// Date parse = format1.parse(format.format(date) + " " + split[i1]); -// Date parse1 = format1.parse(format.format(date) + " " + split1[i1]); -// coursePackageScheduling.setClassDate(parse); -// coursePackageScheduling.setEndDate(parse1); -// coursePackageScheduling.setStatus(1); -// coursePackageSchedulingService.save(coursePackageScheduling); -// CoursePackageStudent student1 = new CoursePackageStudent(); -// student1.setAppUserId(pay.getAppUserId()); -// student1.setStudentId(pay.getStudentId()); -// student1.setCoursePackageId(pay.getCoursePackageId()); -// student1.setCoursePackagePaymentId(pay.getId()); -// student1.setCoursePackageSchedulingId(coursePackageScheduling.getId()); -// student1.setSignInOrNot(1); -// student1.setReservationStatus(1); -// student1.setInsertTime(new Date()); -// studentService.save(student1); -// count++; -// } -// } -// } -// -// -// // 2.0 少于3课时 推送 -// if (coursePackagePayment.getLaveClassHours() <= 3) { -// Integer appUserId = coursePackagePayment.getAppUserId(); -// -// //调用推送 -// HttpHeaders headers = new HttpHeaders(); -// // 以表单的方式提交 -// headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); -// String s1 = appUserId + "_" + "Three"; -// //定时修改排课状态 -// String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id=" + s1, String.class); -// JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class); -// if (jsonObject1.getIntValue("code") != 200) { -// System.err.println(jsonObject1.getString("msg")); -// } -// } -// -// CancelledClasses cancelledClasses = new CancelledClasses(); -// cancelledClasses.setType(2); -// cancelledClasses.setVoucher(paymentDeductionClassHour.getCode()); -// cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId()); -// cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId()); -// cancelledClasses.setCancelledClassesNumber(classHour); -// cancelledClasses.setInsertTime(new Date()); -// cancelledClassesService.save(cancelledClasses); -// -// } else { -// CancelledClasses cancelledClasses = new CancelledClasses(); -// cancelledClasses.setType(2); -// cancelledClasses.setVoucher(paymentDeductionClassHour.getCode()); -// cancelledClasses.setCoursePackageId(coursePackagePayment.getCoursePackageId()); -// cancelledClasses.setCoursePackagePaymentId(coursePackagePayment.getId()); -// cancelledClasses.setCancelledClassesNumber(coursePackagePayment.getLaveClassHours()); -// cancelledClasses.setInsertTime(new Date()); -// cancelledClassesService.save(cancelledClasses); -// -// coursePackagePayment.setLaveClassHours(0); -// packagePaymentService.updateById(coursePackagePayment); -// -// classHour -= cancelledClasses.getCancelledClassesNumber(); -// } -// } - + CourseCounsum courseCounsum = new CourseCounsum(); + courseCounsum.setPaymentId(coursePackageOrderStudent.getId()); + courseCounsum.setChangeType(0); + courseCounsum.setNum(paymentDeductionClassHour.getClassHour()); + courseCounsum.setInsertTime(new Date()); + courseCounsum.setReason("赛事报名"); + courseCounsum.setAppUserId(coursePackageOrderStudent.getAppUserId()); + courseCounsumService.save(courseCounsum); } catch (Exception e) { e.printStackTrace(); @@ -1812,7 +1695,6 @@ // 其他星期减一即可得到1-6的数字表示 dayOfWeek -= 1; } - // todo if (weeks.contains(String.valueOf(dayOfWeek))){ // 限时折扣判断是否在有效期 try { @@ -1962,7 +1844,6 @@ coursePackageScheduling.setAppUserId(userId); coursePackageScheduling.setStudentId(sId); coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); - coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString()); Date parse = format1.parse(format.format(time) + " " + split[j]); Date parse1 = format1.parse(format.format(time) + " " + split1[j]); coursePackageScheduling.setClassDate(parse); @@ -2023,7 +1904,6 @@ coursePackageScheduling.setAppUserId(userId); coursePackageScheduling.setStudentId(sId); coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); - coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString()); Date parse = format1.parse(format.format(time) + " " + split[j]); Date parse1 = format1.parse(format.format(time) + " " + split1[j]); coursePackageScheduling.setClassDate(parse); @@ -2100,7 +1980,6 @@ } CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling(); coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); - coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString()); Date parse = format1.parse(format.format(date) + " " + split[i1]); Date parse1 = format1.parse(format.format(date) + " " + split1[i1]); coursePackageScheduling.setClassDate(parse); @@ -2164,7 +2043,6 @@ } CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling(); coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); - coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString()); Date parse = format1.parse(format.format(date) + " " + split[i1]); Date parse1 = format1.parse(format.format(date) + " " + split1[i1]); coursePackageScheduling.setClassDate(parse); @@ -2200,12 +2078,7 @@ @ResponseBody @PostMapping("/base/coursePack/obtainStudentClassDetails") public List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId) { -// try { return coursePackageOrderStudentService.obtainStuClassDetails(stuId.getStuId(), stuId.getAppUserId(), stuId.getPageNum()); -// }catch (Exception e){ -// e.printStackTrace(); -// throw new RuntimeException(); -// } } @@ -2227,12 +2100,13 @@ @PostMapping("/base/coursePack/sendHours") public Integer sendHours(@RequestBody String s) throws ParseException { String[] split2 = s.split("_"); - TCoursePackagePayment byId = packagePaymentService.getById(Long.valueOf(split2[0])); - byId.setTotalClassHours(byId.getTotalClassHours() + Integer.valueOf(split2[2])); - boolean b = packagePaymentService.updateHoursById(byId, Integer.valueOf(split2[2])); + CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getById(Long.valueOf(split2[0])); + coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + Integer.valueOf(split2[2])); + coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + Integer.valueOf(split2[2])); + coursePackageOrderStudentService.updateById(coursePackageOrderStudent); CourseCounsum courseCounsum = new CourseCounsum(); - courseCounsum.setPaymentId(byId.getId()); + courseCounsum.setPaymentId(coursePackageOrderStudent.getId()); courseCounsum.setChangeType(1); courseCounsum.setNum(Integer.valueOf(split2[2])); courseCounsum.setInsertTime(new Date()); @@ -2240,17 +2114,17 @@ courseCounsumService.save(courseCounsum); - List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId())); + List<CoursePackageStudent> studentCourse = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackageOrderStudent.getStudentId()).eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId())); List<Long> collect = studentCourse.stream().map(CoursePackageStudent::getCoursePackageSchedulingId).collect(Collectors.toList()); coursePackageSchedulingService.remove(new QueryWrapper<CoursePackageScheduling>().in("id", collect)); - coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", byId.getStudentId()).eq("coursePackageId", byId.getCoursePackageId())); + coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().eq("studentId", coursePackageOrderStudent.getStudentId()).eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId())); - TCoursePackage tCoursePackage = packageService.getById(byId.getCoursePackageId()); + TCoursePackage tCoursePackage = packageService.getById(coursePackageOrderStudent.getCoursePackageId()); String classWeeks = tCoursePackage.getClassWeeks(); List<Integer> week = week(classWeeks); - TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", byId.getCoursePackageId()).eq("studentId", byId.getStudentId())); + TCoursePackagePayment pay = packagePaymentService.getOne(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", coursePackageOrderStudent.getCoursePackageId()).eq("studentId", coursePackageOrderStudent.getStudentId())); Date today = new Date(); @@ -2277,7 +2151,6 @@ } CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling(); coursePackageScheduling.setCoursePackageId(tCoursePackage.getId()); - coursePackageScheduling.setCoursePackagePaymentIds(pay.getId().toString()); Date parse = format1.parse(format.format(date) + " " + split[i1]); Date parse1 = format1.parse(format.format(date) + " " + split1[i1]); coursePackageScheduling.setClassDate(parse); @@ -2298,14 +2171,7 @@ } } } - - - if (b) { - return 1; - } else { - - return 0; - } + return 1; } @@ -2386,6 +2252,13 @@ } coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours()-coursePackage.getNeedNum()); orderStudentService.updateById(coursePackageOrderStudent); + Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours(); + if(3 >= laveClassHours){ + AppUser appUser = appuClient.queryAppUser(coursePackageOrderStudent.getAppUserId()); + //发送短信提醒 + aLiSendSms.sendSms(appUser.getPhone(), "SMS_463646317", ""); + } + CourseCounsum courseCounsum = new CourseCounsum(); courseCounsum.setPaymentId(coursePackageOrderStudent.getId()); courseCounsum.setChangeType(0); @@ -2418,7 +2291,6 @@ coursePackagePayment.setAppUserId(null); packagePaymentService.updateById(coursePackagePayment); } - /** * 修改数据 @@ -2603,6 +2475,7 @@ .eq(CoursePackageScheduling::getCoursePackageId, tCoursePackage.getId()) .like(CoursePackageScheduling::getClassDate, courseDetailReq.getTime()) ); + if (list3.isEmpty()) { detailsListVo.setType(2); objects.add(detailsListVo); @@ -2682,6 +2555,10 @@ objects.add(detailsListVo); } + //课程暂停 + if(tCoursePackage.getState() == 4){ + detailsListVo.setType(4); + } } map.put("data", objects); @@ -2726,18 +2603,18 @@ ids.add(-1); } List<TCoursePackagePayment> list1 = packagePaymentService.listOne(ids); - List<Integer> collect = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList()); - if (collect.size() == 0) { - collect.add(-1); - } - List<TCoursePackage> list2 = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect)); - for (TCoursePackagePayment tCoursePackagePayment : list1) { - for (TCoursePackage tCoursePackage : list2) { - if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) { - tCoursePackagePayment.setType(tCoursePackage.getType()); - } - } - } +// List<Integer> collect = list1.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList()); +// if (collect.size() == 0) { +// collect.add(-1); +// } +// List<TCoursePackage> list2 = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().in(TCoursePackage::getId, collect)); +// for (TCoursePackagePayment tCoursePackagePayment : list1) { +// for (TCoursePackage tCoursePackage : list2) { +// if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) { +// tCoursePackagePayment.setType(tCoursePackage.getType()); +// } +// } +// } List<Map<String, Object>> mapList = new ArrayList<>(); @@ -2746,7 +2623,7 @@ map.put("name", tCoursePackageType.getName()); int a = 0; for (TCoursePackagePayment tCoursePackagePayment : list1) { - if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) { + if (null != tCoursePackagePayment.getType() && tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) { a += tCoursePackagePayment.getLaveClassHours(); } } @@ -3031,10 +2908,7 @@ weekData.add(count2); weekData.add(count1); weekData.add(count); - map.put("weekData", weekData); - - LocalDateTime currentDateTime = LocalDateTime.now(); List<Integer> amountByDay = new ArrayList<>(Collections.nCopies(7, 0)); for (CoursePackageStudent coursePackageStudent : list) { @@ -3209,4 +3083,21 @@ return map; } + + + @ResponseBody + @PostMapping("/coursePackagePayment/queryPaymentCoursePackage") + public List<Integer> queryPaymentCoursePackage(@RequestBody List<Integer> storeIds){ + if(storeIds.size() == 0){ + return new ArrayList<>(); + } + List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>().eq("auditStatus", 2) + .ne("status", 4).eq("state", 1).in("storeId", storeIds)); + List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList()); + if(collect.size() == 0){ + return new ArrayList<>(); + } + List<CoursePackageOrder> list1 = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>().in("coursePackageId", collect).eq("payStatus", 2).eq("status", 1)); + return list1.stream().map(CoursePackageOrder::getAppUserId).collect(Collectors.toList()); + } } -- Gitblit v1.7.1