Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/TokenController.java

@@ -5,8 +5,11 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.entity.ImResult;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.security.AuthUser;
 import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.im.ImFeignService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,6 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 import java.io.IOException;
 import java.util.Base64;
+import java.util.Date;
 import java.util.Map;
 
 @RestController
@@ -42,6 +46,9 @@ public class TokenController extends BaseController {
 
 	@Autowired
 	private SysUserService userService;
+
+	@Autowired
+	private ImFeignService imFeignService;
     
     @PostMapping(value = "/smsLogin",consumes = MediaType.APPLICATION_JSON_VALUE)
 	@ApiOperation(value = "短信验证码的方式登录")
@@ -57,6 +64,13 @@ public class TokenController extends BaseController {
     public SysUser queryUserInfo() {
 		AuthUser authUser = SecurityUtils.getUser();
 		if(authUser != null){
+			SysUser sysUser = userService.get(authUser.getUserId());
+			if(StringUtils.isEmpty(sysUser.getImToken())){
+				ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), null));
+				sysUser.setImToken(register.getToken());
+				sysUser.setUpdateTime(new Date());
+				userService.update(sysUser);
+			}
 			return userService.get(authUser.getUserId());
 		}
 		return null;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.CourseStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.BaseEnum;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -142,6 +143,16 @@ public class CourseSchedule {
 
 	private Integer isLock;
 
+	private YesOrNoEnum isCallNames;
+
+	public YesOrNoEnum getIsCallNames() {
+		return isCallNames;
+	}
+
+	public void setIsCallNames(YesOrNoEnum isCallNames) {
+		this.isCallNames = isCallNames;
+	}
+
 	public Integer getIsLock() {
 		return isLock;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2785,6 +2785,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                         .distinct().collect(Collectors.toList());
                 List<Map<Long, Integer>> courseSettlementMaps = courseScheduleTeacherSalaryDao.checkCoursesIsSettlement(courseScheduleIds);
                 Map<Long, Long> courseSettlementMap = MapUtil.convertIntegerMap(courseSettlementMaps);
+                Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
                 dataList.forEach(courseSchedule -> {
                     Long isSettlement = courseSettlementMap.get(courseSchedule.getId().longValue());
                     if (Objects.isNull(isSettlement) || isSettlement <= 0) {
@@ -2792,6 +2793,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     } else {
                         courseSchedule.setIsSettlement(1);
                     }
+                    Long studentNum = studentNumCourseMap.get(courseSchedule.getId());
+                    if (Objects.nonNull(studentNum)) {
+                        courseSchedule.setIsCallNames(studentNum > 0 ? YesOrNoEnum.YES : YesOrNoEnum.NO);
+                    } else {
+                        courseSchedule.setIsCallNames(YesOrNoEnum.NO);
+                    }
                 });
             }
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -3183,9 +3183,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(Objects.isNull(practiceGroup)){
             return BaseController.failed(HttpStatus.FAILED_DEPENDENCY, "该课程组已失效，请重新购买");
         }
-        if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL)){
-            return BaseController.failed(HttpStatus.CREATED, "该订单已经支付成功");
-        }
+//        if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL)){
+//            return BaseController.failed(HttpStatus.CREATED, "该订单已经支付成功");
+//        }
         if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.CANCEL)){
             return BaseController.failed(HttpStatus.FAILED_DEPENDENCY, "该课程组已失效，请重新购买");
         }
@@ -3193,7 +3193,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map<DealStatusEnum, List<StudentPaymentOrder>> statusOrderMap = userGroupOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus));
         List<StudentPaymentOrder> successOrders=statusOrderMap.get(DealStatusEnum.SUCCESS);
         if(!CollectionUtils.isEmpty(successOrders)&&successOrders.size()>0){
-            return BaseController.failed(HttpStatus.CREATED, "该订单已经支付成功");
+            Map<String, Object> result=new HashMap<>();
+            result.put("orderNo", successOrders.get(0).getOrderNo());
+            return BaseController.succeed(result);
         }
 
         StudentPaymentOrder latestOrder=userGroupOrders.stream().max(Comparator.comparing(StudentPaymentOrder::getId)).get();
@@ -3286,6 +3288,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.LOCK)){
             groupService.deleteGroupOtherInfo(groupId.toString(),GroupType.PRACTICE);
             practiceGroup.setGroupStatus(GroupStatusEnum.CANCEL);
+            practiceGroupDao.update(practiceGroup);
         }else if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.NORMAL)){
             return BaseController.failed(HttpStatus.CREATED, "该订单已经支付成功");
         }else if(practiceGroup.getGroupStatus().equals(GroupStatusEnum.CANCEL)){

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -107,7 +107,7 @@ public class RoomServiceImpl implements RoomService {
         }catch (Exception e){
             e.printStackTrace();
         }
-        roomId = "DAYA" + roomId;
+        roomId = "S" + roomId;
         String display = "";
         Date curTime = DateTimeUtils.currentUTC();
         List<Room> roomList = roomDao.findByRid(roomId);
@@ -248,12 +248,12 @@ public class RoomServiceImpl implements RoomService {
         SysUser user = sysUserFeignService.queryUserInfo();
         String userId = user.getId().toString();
         Teacher teacher = teacherDao.get(user.getId());
-        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
+        CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
         try {
             if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), SignStatusEnum.SIGN_OUT,true);
+                teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), SignStatusEnum.SIGN_OUT,true);
             }else {
-                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),user.getId(), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
             }
         }catch (Exception e){
             e.printStackTrace();
@@ -1136,12 +1136,12 @@ public class RoomServiceImpl implements RoomService {
 //            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
             SysUser sysUser = teacherDao.getUser(Integer.parseInt(userId));
             Teacher teacher = teacherDao.get(sysUser.getId());
-            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(4)));
+            CourseSchedule courseSchedule = courseScheduleDao.get(Long.parseLong(roomId.substring(1)));
             try {
                 if(teacher != null && teacher.getId().equals(courseSchedule.getActualTeacherId())){
-                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
+                    teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), SignStatusEnum.SIGN_OUT,true);
                 }else {
-                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(4)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
+                    studentAttendanceService.addStudentAttendanceRecord(Integer.parseInt(roomId.substring(1)),Integer.parseInt(userId), StudentAttendanceStatusEnum.NORMAL,SignStatusEnum.SIGN_OUT);
                 }
             }catch (Exception e){
                 e.printStackTrace();