11.27,8

nickchange

2023-11-28 979f60ea40cae11717644d64233797630b5e51f5

11.27,8

 cloud-server-account/src/main/java/com/dsh/account/service/impl/EvaluateStudentServiceImpl.java

@@ -61,7 +61,7 @@
                vo.setHeadImg(user.getAvatar());
//                vo.setStuName(tStudent.getName());
                vo.setStuName(user.getName());
                vo.setComTime(format.format(tStudent.getInsertTime()));
                vo.setComTime(format.format(evaluateStudent.getInsertTime()));
                vo.setContents(evaluateStudent.getContent());
                String imgs = evaluateStudent.getImgs();
                String[] split = imgs.split(",");

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -324,7 +324,6 @@
        }


//        if (cIds.size()>0) {

        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds)
                .eq("state", 1)
@@ -341,9 +340,10 @@
                integralCommodity.setSort(merchandise.getSort());
                commodity.add(integralCommodity);
            }
//            }
        }



        System.out.println(commodity);
        return commodity;
    }

 cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java

@@ -132,7 +132,7 @@
                    String[] split = classWeeks.split(";");
                    List<String> integerList = Arrays.asList(split);
                    String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
                    if (integerList.contains(weekOfDate)) {
//                    if (integerList.contains(weekOfDate)) {
                        String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);

                        Date start = null;
@@ -171,9 +171,9 @@
                                }
                            }
                        }
                    } else {
                        recordVo.setStatus(1);
                    }
//                    } else {
//                        recordVo.setStatus(1);
//                    }
                    recordVoList.add(recordVo);
                }


 cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java

@@ -63,10 +63,20 @@
            int count1 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 1));
            int count2 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 0));

            CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(id);

            map.put("registered", count2);
            map.put("actualArrival", count1);
            map.put("nonArrival", count - count1);
            List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingMapper.selectList(new QueryWrapper<CoursePackageScheduling>().eq("classDate", coursePackageScheduling.getClassDate()).eq("coursePackageId", coursePackageScheduling.getCoursePackageId()));
            List<Long> scs = new ArrayList<>();
            for (CoursePackageScheduling packageScheduling : coursePackageSchedulings) {
                scs.add(packageScheduling.getId());
            }
            int res = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 2));
            int act = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 1));
            int nonArrival = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 0));

            map.put("registered", res);
            map.put("actualArrival", act);
            map.put("nonArrival",nonArrival);
//            Integer totalClassHours = (Integer) map.get("totalClassHours");
//            Integer laveClassHours = (Integer) map.get("laveClassHours");
//            map.put("already",totalClassHours-laveClassHours);

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java

@@ -1068,6 +1068,7 @@
                                    break;
                                }
                                if ("TRADE_SUCCESS".equals(s)) {

                                    coursePackageOrder1.setPayStatus(2);
                                    coursePackageOrder1.setOrderNumber(tradeNo);
                                    coursePackageOrder1.setAppUserId(null);
@@ -1198,6 +1199,23 @@

                    //开始排课
                    addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent);
                    //课时记录
                    CourseCounsum courseCounsum = new CourseCounsum();
                    courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
                    courseCounsum.setChangeType(1);
                    courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
                    courseCounsum.setInsertTime(new Date());
                    courseCounsum.setReason("购买课包");
                    courseCounsumService.save(courseCounsum);
                    //账单记录
                    CourseCounsum courseCounsum1 = new CourseCounsum();
                    courseCounsum1.setPaymentId(coursePackageOrder.getId());
                    courseCounsum1.setChangeType(3);
                    courseCounsum1.setInsertTime(new Date());
                    courseCounsum1.setReason("报名课程;"+coursePackageOrder.getCashPayment());
                    courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
                    courseCounsumService.save(courseCounsum1);

                } else {
                    Date useTime = coursePackageOrderStudent.getUseTime();
                    coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
@@ -1212,14 +1230,27 @@
                    if (useTime.compareTo(new Date()) < 0) {
                        addPackageStudent(coursePackage, coursePackageOrder.getAppUserId(), Integer.valueOf(id), coursePackageOrderStudent);
                    }

                    //课时记录
                    CourseCounsum courseCounsum = new CourseCounsum();
                    courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
                    courseCounsum.setChangeType(1);
                    courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
                    courseCounsum.setInsertTime(new Date());
                    courseCounsum.setReason("续课");
                    courseCounsumService.save(courseCounsum);
                    //账单记录
                    CourseCounsum courseCounsum1 = new CourseCounsum();
                    courseCounsum1.setPaymentId(coursePackageOrder.getId());
                    courseCounsum1.setChangeType(3);
                    courseCounsum1.setInsertTime(new Date());
                    courseCounsum1.setReason("续课;"+coursePackageOrder.getCashPayment());
                    courseCounsum1.setAppUserId(coursePackageOrder.getAppUserId());
                    courseCounsumService.save(courseCounsum1);


                }
                CourseCounsum courseCounsum = new CourseCounsum();
                courseCounsum.setPaymentId(coursePackageOrderStudent.getId());
                courseCounsum.setChangeType(1);
                courseCounsum.setNum(coursePackagePaymentConfig.getClassHours());
                courseCounsum.setInsertTime(new Date());
                courseCounsum.setReason("购买课包");
                courseCounsumService.save(courseCounsum);



            }

 cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js

@@ -16,7 +16,13 @@
        {field: 'selectItem', radio: true},
        {title: '序号', field: 'id', visible: true, align: 'center', valign: 'middle'},
        {title: '日期', field: 'classDate', align: 'center', valign: 'middle'},
        {title: '请假学员', field: 'registered', align: 'center', valign: 'middle'},
        {title: '请假学员', field: 'registered', align: 'center', valign: 'middle',formatter: function (v, row) {
                if (row.cancelClasses === undefined) {
                    return 0;
                } else {
                    return v;
                }
            }},
        {title: '实到学员', field: 'actualArrival', align: 'center', valign: 'middle',
            formatter: function (v, row) {
                if (row.cancelClasses === undefined) {
@@ -28,7 +34,7 @@
        },
        {title: '未到学员', field: 'nonArrival', align: 'center', valign: 'middle',
            formatter: function (v, row) {
                if (row.absencesNumber === undefined) {
                if (row.cancelClasses === undefined) {
                    return 0;
                } else {
                    return v;