Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/resources/application.yml

@@ -81,7 +81,6 @@ management:
     health:
       show-details: ALWAYS
 
-
 ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -126,7 +126,7 @@ public class RoomServiceImpl implements RoomService {
         RoomResult.MemberResult userResult = new RoomResult.MemberResult();
         List<RoomMember> memberList = roomMemberDao.findByRidAndUid(roomId, userId);
         if (memberList.isEmpty()) {
-            if(userId.equals(examRoom.getMainTeacherUserId())){
+            if(sysUser.getId().equals(examRoom.getMainTeacherUserId())){
                 roleEnum = RoleEnum.MainTeacher;
             }else if(isAssistant){
                 roleEnum = RoleEnum.AssistantTeacher;

edu-im/edu-im-server/src/main/resources/application.yml

@@ -70,6 +70,10 @@ spring:
 swagger:
   base-package: com.keao.edu.im.controller
 
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
 ##认证
 security:
   oauth2:

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -6,7 +6,9 @@ import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(contextId = "eduUserFeignService", name = "user-server", configuration = { FeignConfiguration.class }, fallback = EduUserFeignServiceFallback.class)
 public interface EduUserFeignService {
@@ -16,7 +18,7 @@ public interface EduUserFeignService {
 	 * @param id
 	 * @return
 	 */
-	@GetMapping(value = "examRoom/get")
+	@PostMapping(value = "examRoom/api/get")
 	ExamRoom getExamRoom(@RequestParam("id") Integer id);
 
 	/**

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomController.java

@@ -137,6 +137,12 @@ public class ExamRoomController extends BaseController {
         return succeed(examRoomService.get(id));
     }
 
+    @ApiOperation("获取教室")
+    @PostMapping(value = "/api/get")
+    public ExamRoom getApiExamRoom(Long id){
+        return examRoomService.get(id);
+    }
+
     @ApiOperation("获取考场统计信息")
     @GetMapping(value = "/getExamRoomStatisticsInfo")
     public HttpResponseResult<ExamRoomStatisticsDto> getExamRoomStatisticsInfo(Long examId){

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationPaymentServiceImpl.java

@@ -110,8 +110,10 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
         }
         //更新报名人数，和报名金额
         ExamOrganizationRelation examOrganizationRelation = examOrganizationRelationDao.getExamOrganizationRelation(examRegistration.getExaminationBasicId(), examRegistration.getOrganId());
-        examOrganizationRelation.setSelfRegistrationStudentNum(examOrganizationRelation.getSelfRegistrationStudentNum() + 1);
-        BigDecimal amount = examOrganizationRelation.getSelfPaymentAmount().add(examRegistration.getLevelFee()).add(examRegistration.getTheoryLevelFee());
+        int selfRegistrationStudentNum = examOrganizationRelation.getSelfRegistrationStudentNum() == null? 0 : examOrganizationRelation.getSelfRegistrationStudentNum();
+        examOrganizationRelation.setSelfRegistrationStudentNum(selfRegistrationStudentNum + 1);
+        BigDecimal selfPaymentAmount = examOrganizationRelation.getSelfPaymentAmount() == null? BigDecimal.ZERO : examOrganizationRelation.getSelfPaymentAmount();
+        BigDecimal amount = selfPaymentAmount.add(examRegistration.getLevelFee()).add(examRegistration.getTheoryLevelFee());
         examOrganizationRelation.setSelfPaymentAmount(amount);
         if (examOrganizationRelationDao.update(examOrganizationRelation) <= 0) {
             throw new BizException("报名人数报名金额更新失败");
@@ -260,7 +262,7 @@ public class ExamRegistrationPaymentServiceImpl extends BaseServiceImpl<Long, Ex
                 rpMap.put("transStatus", "FAILED");
             }
 
-            if (rpMap.containsKey("tradeState")) {
+            if (rpMap.containsKey("transStatus")) {
                 try {
                     updateOrder(rpMap); //更新订单
                 } catch (Exception e) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRegistrationServiceImpl.java

@@ -118,7 +118,7 @@ public class ExamRegistrationServiceImpl extends BaseServiceImpl<Long, ExamRegis
         examRegistration.setUpdateTime(nowDate);
 
         statusEnumList.clear();
-        statusEnumList.add(StudentRegistrationStatusEnum.AUDIT_WAIT);
+        statusEnumList.add(StudentRegistrationStatusEnum.PAY_WAIT);
         registration = examRegistrationDao.getRegistration(examinationBasic.getId(),
                 examRegistration.getStudentId(), null, null,
                 statusEnumList);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/OrganizationServiceImpl.java

@@ -89,11 +89,14 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				//新增用户角色
 				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
+				}else {
+					Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
+					sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
 				}
 				if(!user.getUserType().contains("SYSTEM")){
 					user.setUserType(user.getUserType() + ",SYSTEM");
 				}
-				user.setRealName(organ.getName());
+				user.setRealName(organ.getContactName());
 				user.setPhone(organ.getContactPhone());
 				sysUserDao.update(user);
 			}else if(organization.getDelFlag() == YesOrNoEnum.YES){
@@ -103,10 +106,15 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				}else {
 					sysUser.setUserType(sysUser1.getUserType() + ",SYSTEM");
 				}
+				sysUser.setRealName(organ.getContactName());
+				sysUser.setPhone(organ.getContactPhone());
 				sysUser.setId(sysUser1.getId());
 				sysUserDao.update(sysUser);
 				if(sysUser.getRoles() != null){
 					sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+				}else {
+					Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
+					sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
 				}
 				Employee employee = employeeDao.get(sysUser.getId());
 				employee.setDelFlag(false);
@@ -134,6 +142,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUserDao.delEmployeeRole(sysUser.getId());
 		if(sysUser.getRoles() != null){
 			sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
+		}else {
+			Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
 		}
 		Employee employee = new Employee();
 		employee.setOrganId(organ.getId());
@@ -162,7 +173,7 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 				throw new BizException("手机号已存在");
 			}
 		}
-		sysUser.setRealName(organization.getName());
+		sysUser.setRealName(organization.getContactName());
 		sysUser.setPhone(organization.getContactPhone());
 		organization.setUserId(organization1.getUserId());
 		organDao.update(organization);
@@ -173,6 +184,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		sysUserDao.batchDelEmployeeRole(userIds);
 		if(sysUser.getRoles() != null){
 			sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
+		}else {
+			SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
+			Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
+			sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
 		}
 
 		sysUserDao.update(sysUser);

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/TenantInfoServiceImpl.java

@@ -79,7 +79,7 @@ public class TenantInfoServiceImpl extends BaseServiceImpl<Integer, TenantInfo>
 		organ.setLevel(0);
 		organ.setParentOrganIdTag(sysUser.getId().toString());
 		organ.setId(sysUser.getId());
-		organ.setName(sysUser.getRealName());
+		organ.setName(tenantInfo.getName());
 		organ.setContactName(tenantInfo.getContactName());
 		organ.setContactPhone(tenantInfo.getContactPhone());
 		organ.setIsAllowArrangeExam(1);

edu-user/edu-user-server/src/main/resources/application.yml

@@ -103,8 +103,8 @@ management:
       show-details: ALWAYS
       
 ribbon:
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
 
 message:
   debugMode: true

edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationPaymentMapper.xml

@@ -172,7 +172,7 @@
         FROM exam_registration_payment
         WHERE student_id_ = #{userId}
           AND examination_basic_id_ = #{examinationBasicId}
-          AND trans_status_ = 'ING'
+          AND trans_status_ = 'ING' LIMIT 1
     </select>
 
     <!-- 根据订单号获取订单 -->