无关风月
2024-07-11 eb6b6dbb35a9f029e0b7d269773685c19fd40976
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.dto.*;
import com.dsh.course.entity.CoursePackageOrderStudent;
import com.dsh.course.entity.EvaluateStudent;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.StudentClient;
@@ -198,18 +199,31 @@
        String formattedDate = dateFormat.format(new Date());
        model.addAttribute("reDate", formattedDate);
        List<TCoursePackagePayment> coursePackagePayments =  courseStuddentClient.queryByIds(ids);
        List<CoursePackageOrderStudent> coursePackagePayments =  courseStuddentClient.queryByIds(ids);
        BigDecimal countAll = new BigDecimal(0);
        for (TCoursePackagePayment payment : coursePackagePayments){
        for (CoursePackageOrderStudent payment : coursePackagePayments){
            //课包名称
            TCoursePackage tCoursePackage = coursePackageClient.queryById(payment.getCoursePackageId());
             List<CoursePackageOrder> ordes =  courseStuddentClient.getOrder(payment.getId());
            payment.setName(tCoursePackage.getName());
            payment.setId(Long.valueOf(tCoursePackage.getId()));
            BigDecimal cashPayment = payment.getCashPayment();
            BigDecimal cashPayment = BigDecimal.ZERO;
            for (CoursePackageOrder order : ordes) {
                BigDecimal cashPayment1 = order.getCashPayment();
                if (cashPayment1 != null) {
                    cashPayment = cashPayment.add(cashPayment1);
                }
            }
            payment.setCashPayment(cashPayment);
//            BigDecimal cashPayment = payment.getCashPayment();
            if (cashPayment==null){
                cashPayment = BigDecimal.ZERO;
            }
@@ -345,7 +359,6 @@
            model.addAttribute("back",false);
        }else {
            model.addAttribute("back",true);
        }
        return PREFIX + "tStudentEdit.html";
@@ -795,10 +808,10 @@
        System.out.println("========ToHoliDto========="+resultUtil);
        if (resultUtil==""||resultUtil==null){
            return new ResultUtil<>(0,0,"报名成功");
        if (resultUtil.equals("报名成功")){
            return new ResultUtil<>(0,0,resultUtil);
        }else{
        return new ResultUtil<>(0,0,"报名成功,以下学员剩余课时不足"+resultUtil);}
        return new ResultUtil<>(0,1,resultUtil);}
    }
@@ -819,12 +832,16 @@
        String resultUtil = courseStuddentClient.toTrans(toHoliDto);
        System.out.println("========ToHoliDto========="+resultUtil);
        if (resultUtil.equals("换课成功")) {
//            return ResultUtil.success(resultUtil);
                        return new ResultUtil<>(0,0,resultUtil);
        if (resultUtil==""){
            return new ResultUtil<>(0,0,"报名成功");
        }else{
            return new ResultUtil<>(0,0,"报名成功,以下学员剩余课时不足"+resultUtil);}
    }
        }else {
            return new ResultUtil<>(0,1,resultUtil);}
        }
//        if (resultUtil==""){
//        }else{
    //赠课