From 21430485c1907d8fb32f2dc0fc567b27514fdd14 Mon Sep 17 00:00:00 2001 From: tianea Date: Fri, 2 Sep 2022 14:43:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitiion/api/biz/CompetitionMemberBiz.java | 8 +++++++- .../com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionMemberBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionMemberBiz.java index 91ba64b..16d1875 100644 --- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionMemberBiz.java +++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/api/biz/CompetitionMemberBiz.java @@ -2,6 +2,7 @@ package com.tz.platform.competitiion.api.biz; import cn.hutool.core.date.DateUtil; import com.tz.platform.common.core.base.Result; +import com.tz.platform.common.core.bo.Stage; import com.tz.platform.common.core.tools.BeanUtils; import com.tz.platform.competitiion.api.dto.CompetitionMemberDTO; import com.tz.platform.competitiion.api.dto.ExamPaperDTO; @@ -37,6 +38,9 @@ public class CompetitionMemberBiz { @Autowired private MemberLogDao memberLogDao; + @Autowired + private CompetitionDao competitionDao; + @Autowired private RedisTemplate template; @@ -97,6 +101,8 @@ public class CompetitionMemberBiz { if(StringUtils.hasText(member.getAccountId())){ return Result.success(BeanUtils.copyProperties(member,CompetitionMemberDTO.class)); } + Competition competition =competitionDao.getById(compId); + Stage cStage = competition.getStageList().stream().filter(stage -> stage.getId() == stageId).findFirst().orElse(null); String competitionTaskKey = "competition_task_"+compId+"_"+stageId; Object taskObj = template.opsForValue().get(competitionTaskKey); @@ -109,7 +115,7 @@ public class CompetitionMemberBiz { } //未开赛后不生成交易系统权限 - if(competitionTask.getOperationStartTime().getTime()> System.currentTimeMillis()){ + if(competitionTask.getOperationStartTime().getTime()> System.currentTimeMillis()||!cStage.isEnableFinance()){ return Result.success(BeanUtils.copyProperties(member,CompetitionMemberDTO.class)); } diff --git a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java index 271bc52..06aea7f 100644 --- a/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java +++ b/tz/user/user-service/src/main/java/com/tz/platform/zhiyun/biz/ZhiyunAccountBiz.java @@ -38,7 +38,6 @@ public class ZhiyunAccountBiz { public void synAccountJob(){ List schoolVoList = feignSchool.list(); schoolVoList.forEach(schoolVo -> { - String studentContent = zhiYunApi.findAllStudent(schoolVo.getOuterId()); dealStudent(studentContent,schoolVo); String teacherCountent = zhiYunApi.findTeacherBySchoolId(schoolVo.getOuterId()); @@ -65,10 +64,16 @@ public class ZhiyunAccountBiz { public void synQuestion(){ List schoolVoList = feignSchool.list(); schoolVoList.forEach(schoolVo -> { - + String content = zhiYunApi.findAllQuestion(); }); } + public void synCourse(Integer schoolId){ + String content = zhiYunApi.findClassesBySchoolId(schoolId); + //图片baseUrl http://cloud.sztzjy.com/ + + } + private void dealGrade(String content,SchoolVo school){ JSONObject jsonObject = JSONUtil.parseObj(content);