支付版本更新 根据资金流向使用V2或V3服务商版本支付

无关风月

21 小时以前 5dc40fcd64b0513150f1d8335ab849e6d8cdc28e

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java

@@ -67,6 +67,10 @@
        if (null != one) {
            return ResultUtil.error("电话号码重复");
        }
//        Participant two = this.getOne(new QueryWrapper<Participant>().eq("appUserId", uid).eq("idcard", addParticipant.getIdcard()).eq("state", 1));
//        if (null != two) {
//            return ResultUtil.error("身份证号码重复");
//        }
        if (ToolUtil.isNotEmpty(addParticipant.getName()) && ToolUtil.isNotEmpty(addParticipant.getIdcard())) {
            Boolean aBoolean = JuHeUtil.idcardAuthentication(addParticipant.getIdcard(), addParticipant.getName());
            if (!aBoolean) {
@@ -94,8 +98,8 @@
        tStudent.setName(addParticipant.getName());
        tStudent.setPhone(addParticipant.getPhone());
        if (ToolUtil.isNotEmpty(addParticipant.getBirthday())){
            Date date = DateUtils.parseDate(addParticipant.getBirthday());
            tStudent.setBirthday(date);
            Date parse = sdf.parse(addParticipant.getBirthday());
            tStudent.setBirthday(parse);
        }else{
                String birthDateStr = addParticipant.getIdcard().substring(6, 14);
                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -135,47 +139,47 @@
        //查出临时表里的数据，也去重
        List<Participant> list = this.list(new QueryWrapper<Participant>().eq("appUserId", uid).eq("state", 1));
        List<ParticipantVo> listVo = new ArrayList<>();
        for (Participant participant : list) {
            ParticipantVo participantVo = new ParticipantVo();
            participantVo.setId(participant.getId());
            participantVo.setName(participant.getName());
            participantVo.setIdcard(participant.getIdcard());
            if (null != participant.getBirthday()){
                Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
                participantVo.setAge(age);
            }else{
                participantVo.setAge(18);

            }
            Student student = null;
            if(ToolUtil.isNotEmpty(participant.getPhone())){
                student = studentClient.queryStudentByPhone(participant.getPhone());
            }
            //设为不是学员
            participantVo.setIsStudent(0);

            if (null != student) {
                Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
                participantVo.setResidueClassHour(integer);
            } else {
                participantVo.setResidueClassHour(0);
            }
            participantVo.setPhone(participant.getPhone());
            participantVo.setHeight(participant.getHeight());
            participantVo.setWeight(participant.getWeight());
            participantVo.setHeadImg(participant.getHeadImg());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
            if (null != participant.getBirthday()) {
                String format = sdf.format(participant.getBirthday());
                participantVo.setBirthday(format);
            }
            participantVo.setGender(participant.getGender());
            if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
                listVo1.add(participantVo);
                continue;
            }
            linkedHashMap.put(participant.getIdcard(), participantVo);
        }
//        for (Participant participant : list) {
//            ParticipantVo participantVo = new ParticipantVo();
//            participantVo.setId(participant.getId());
//            participantVo.setName(participant.getName());
//            participantVo.setIdcard(participant.getIdcard());
//            if (null != participant.getBirthday()){
//                Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
//                participantVo.setAge(age);
//            }else{
//                participantVo.setAge(18);
//
//            }
//            Student student = null;
//            if(ToolUtil.isNotEmpty(participant.getPhone())){
//                student = studentClient.queryStudentByPhone(participant.getPhone());
//            }
//            //设为不是学员
//            participantVo.setIsStudent(0);
//
//            if (null != student) {
//                Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
//                participantVo.setResidueClassHour(integer);
//            } else {
//                participantVo.setResidueClassHour(0);
//            }
//            participantVo.setPhone(participant.getPhone());
//            participantVo.setHeight(participant.getHeight());
//            participantVo.setWeight(participant.getWeight());
//            participantVo.setHeadImg(participant.getHeadImg());
//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//            if (null != participant.getBirthday()) {
//                String format = sdf.format(participant.getBirthday());
//                participantVo.setBirthday(format);
//            }
//            participantVo.setGender(participant.getGender());
//            if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
//                listVo1.add(participantVo);
//                continue;
//            }
//            linkedHashMap.put(participant.getIdcard(), participantVo);
//        }

        for (TStudent tStudent : tStudents) {
            ParticipantVo participantVo = new ParticipantVo();
@@ -187,7 +191,9 @@
            Integer integer = coursePackagePaymentClient.queryResidueClassHour(tStudent.getId());
            participantVo.setResidueClassHour(integer);
            participantVo.setPhone(tStudent.getPhone());
            participantVo.setHeight(tStudent.getHeight().intValue());
            if (tStudent.getHeight()!=null){
                participantVo.setHeight(tStudent.getHeight().intValue());
            }
            participantVo.setWeight(tStudent.getWeight());
            participantVo.setHeadImg(tStudent.getHeadImg());
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");