44323
2023-09-26 6676f28a5a6ca65015a2b2c26e804fa998d625c8
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -39,6 +39,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -129,6 +130,17 @@
            list.add(value);
        }
        return cpConfigMapper.changeState(list,dto.getPayUserName(),dto.getUserId());
    }
    @Override
    public List<RegisterOrderVO> listAllRegister(RegisterOrderQuery query) {
        String STime = null;
        String ETime = null;
        if (StringUtils.hasLength(query.getRegisterTime())) {
            STime = query.getRegisterTime().split(" - ")[0] + " 00:00:00";
            ETime = query.getRegisterTime().split(" - ")[1] + " 23:59:59";
        }
        return cpConfigMapper.listAllRegister(query,STime,ETime,query.getAmount());
    }
    /**
@@ -724,6 +736,7 @@
        }
        List<Map<String, Object>> list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
        for (Map<String, Object> map : list) {
            Long id = Long.valueOf(map.get("id").toString());
            Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
            Integer studentId = Integer.valueOf(map.get("studentId").toString());
@@ -733,8 +746,12 @@
            Student student = studentClient.queryStudentById(studentId);
            map.put("studentName", null != student ? student.getName() : "");
            Integer integer = cpsMapper.selectCount(new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId)
                    .eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 1));
                    .eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 2));
            map.put("already", integer);
//            if (student != null && student.getName().equals("杨锴1")) {
//                map.put("totalClassHours", "测试");
//            }
            ;
        }
        return list;
    }
@@ -831,7 +848,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) {
@@ -930,7 +947,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());
@@ -987,7 +1004,7 @@
                    student1.setReservationStatus(1);
                    student1.setInsertTime(new Date());
                    cpsMapper.insert(student1);
                } catch (ParseException e) {
                } catch (Exception e) {
                    e.printStackTrace();
                }
@@ -998,7 +1015,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());
@@ -1032,7 +1049,7 @@
    }
    @Override
    public List<Integer> getStudentIds(Integer payId) {
    public List<Integer> getStudentIds(Long payId) {
       return  this.baseMapper.getStudentIds(payId);
    }