From d954784593cb24b0455529ea28588a317c5d766f Mon Sep 17 00:00:00 2001 From: luo <2855143437@qq.com> Date: 星期二, 26 九月 2023 17:05:30 +0800 Subject: [PATCH] 9.26 --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java index 994cab8..523ff41 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java +++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java @@ -108,11 +108,13 @@ Integer classHours = jsonObject.getInteger("classHours"); Double cashPayment = jsonObject.getDouble("cashPayment"); Integer playPaiCoin = jsonObject.getInteger("playPaiCoin"); + String couponIds = jsonObject.getString("couponIds"); CoursePackagePaymentConfig coursePackagePaymentConfig1 = new CoursePackagePaymentConfig(); coursePackagePaymentConfig1.setCoursePackageId(integer); coursePackagePaymentConfig1.setClassHours(classHours); coursePackagePaymentConfig1.setCashPayment(cashPayment); coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin); + coursePackagePaymentConfig1.setCouponIds(couponIds); coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1); } } @@ -144,11 +146,13 @@ Integer classHours = jsonObject.getInteger("classHours"); Double cashPayment = jsonObject.getDouble("cashPayment"); Integer playPaiCoin = jsonObject.getInteger("playPaiCoin"); + String couponIds = jsonObject.getString("couponIds"); CoursePackagePaymentConfig coursePackagePaymentConfig1 = new CoursePackagePaymentConfig(); coursePackagePaymentConfig1.setCoursePackageId(coursePackage.getId()); coursePackagePaymentConfig1.setClassHours(classHours); coursePackagePaymentConfig1.setCashPayment(cashPayment); coursePackagePaymentConfig1.setPlayPaiCoin(playPaiCoin); + coursePackagePaymentConfig1.setCouponIds(couponIds); coursePackagePaymentConfigClient.addCoursePackagePaymentConfig(coursePackagePaymentConfig1); } } @@ -457,7 +461,14 @@ continue; } TCoursePackagePayment tCoursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackageStudent.getCoursePackagePaymentId()); + + if(tCoursePackagePayment.getLaveClassHours() - deductClassHour<0){ + coursePackageStudentClient.editCoursePackageStudent(coursePackageStudent); + continue; + } tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours() - deductClassHour); + + if(coursePackageStudent.getSignInOrNot() == 0){ tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1); } @@ -576,6 +587,7 @@ @Override public ResultUtil makeUpMissedLessons(Long coursePackagePaymentId) { TCoursePackagePayment coursePackagePayment = coursePackagePaymentClient.queryCoursePackagePaymentById(coursePackagePaymentId); + System.out.println("=========coursePackagePayment=====>"+coursePackagePayment); if(coursePackagePayment.getStatus() == 2){ return ResultUtil.error("该学员已退课"); } -- Gitblit v1.7.1