Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into vip_price_827

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -95,7 +95,7 @@ public class NewsController extends BaseController {
 			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
 
 			//厦门学员
-			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
 			if(memberGroupNum>0||xiaMenNotShow){
 				queryInfo.setExcludeIds(excludeIds);
 			}
@@ -146,7 +146,7 @@ public class NewsController extends BaseController {
 			queryInfo.setOrganId(user.getOrganId());
 			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
 			//厦门学员
-			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
 			if(memberGroupNum>0||xiaMenNotShow){
 				queryInfo.setExcludeIds(excludeIds);
 			}

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

@@ -76,11 +76,21 @@ public class Student extends SysUser {
 	@ApiModelProperty(value = "活动排课信息")
 	private String activityCourseDetail;
 
+	private Integer countFlag;
+
 	public Student(Integer userId, String subjectIdList) {
 		this.userId = userId;
 		this.subjectIdList = subjectIdList;
 	}
 
+	public Integer getCountFlag() {
+		return countFlag;
+	}
+
+	public void setCountFlag(Integer countFlag) {
+		this.countFlag = countFlag;
+	}
+
 	public Integer getExperienceMemberRankSettingId() {
 		return experienceMemberRankSettingId;
 	}

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

@@ -3835,17 +3835,19 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         for (PracticeCourseDto userPracticeGroup : userPracticeGroups) {
             JSONArray coursesArry = new JSONArray();
             JSONObject courseJson = JSON.parseObject(userPracticeGroup.getDrillTimesJson());
-            for (String weekNumStr : courseJson.keySet()) {
-                JSONObject newCourseJson = new JSONObject();
-                newCourseJson.put("weekName", DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
-                LocalTime courseStartTime = LocalTime.parse(courseJson.getString(weekNumStr), DateUtil.timeFormatter);
-                LocalTime courseEndTime = courseStartTime.plusMinutes(practiceCourseMinutes);
-                if(PracticeGroupType.COME_ON_PACKAGE.equals(userPracticeGroup.getType())){
-                    courseEndTime = courseStartTime.plusMinutes(2*practiceCourseMinutes);
+            if(courseJson != null){
+                for (String weekNumStr : courseJson.keySet()) {
+                    JSONObject newCourseJson = new JSONObject();
+                    newCourseJson.put("weekName", DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
+                    LocalTime courseStartTime = LocalTime.parse(courseJson.getString(weekNumStr), DateUtil.timeFormatter);
+                    LocalTime courseEndTime = courseStartTime.plusMinutes(practiceCourseMinutes);
+                    if(PracticeGroupType.COME_ON_PACKAGE.equals(userPracticeGroup.getType())){
+                        courseEndTime = courseStartTime.plusMinutes(2*practiceCourseMinutes);
+                    }
+                    newCourseJson.put("startTime", courseStartTime.format(DateUtil.timeFormatter));
+                    newCourseJson.put("endTime", courseEndTime.format(DateUtil.timeFormatter));
+                    coursesArry.add(newCourseJson);
                 }
-                newCourseJson.put("startTime", courseStartTime.format(DateUtil.timeFormatter));
-                newCourseJson.put("endTime", courseEndTime.format(DateUtil.timeFormatter));
-                coursesArry.add(newCourseJson);
             }
             userPracticeGroup.setDrillTimesJson(coursesArry.toJSONString());
         }

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

@@ -719,7 +719,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             studentExtracurricularExercisesSituationDao.deleteByStudent(student.getId(), monDayDate.toString());
         }
         webFeignService.updateNickName(userId,student.getUsername());
-        imFeignService.update(new ImUserModel(userId.toString(),student.getUsername(),sysUser1.getAvatar()));
+        imFeignService.update(new ImUserModel(userId.toString(),student.getUsername(),sysUser1 == null ? null:sysUser1.getAvatar()));
         return userId;
     }
 

mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -32,6 +32,7 @@
         <result column="organ_name_" property="organName"/>
         <result column="phone_" property="phone"/>
         <result column="username_" property="username"/>
+        <result column="count_flag_" property="countFlag"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

mec-student/src/main/java/com/ym/mec/student/controller/ImGroupController.java

@@ -50,9 +50,11 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群详情")
 	@GetMapping(value = "/queryGroupDetail")
-	public Object queryGroupList(Long imGroupId) {
-
-		return succeed(imGroupService.get(imGroupId));
+	public Object queryGroupDetail(String imGroupId) {
+		if (imGroupId.contains("S") || imGroupId.contains("I")){
+			imGroupId = imGroupId.substring(1);
+		}
+		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
 	}
 
 	@ApiOperation("查询群成员列表")

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -232,14 +232,17 @@ public class PracticeGroupController extends BaseController {
         }
         int studentExitChargePractices = practiceGroupDao.checkStudentExitChargePractice(sysUser.getId(),"2021-03-09 00:00:00");
         Student student = studentDao.get(sysUser.getId());
+        if(student == null){
+            throw new BizException("学员信息不存在");
+        }
         Map<String, Integer> result=new HashMap<>();
         result.put("organId", sysUser.getOrganId());
         result.put("isNewStudent", studentExitChargePractices<=0?0:1);
 
         List<PracticeGroup> userStatusPracticeGroups = practiceGroupDao.findUserStatusPracticeGroups(sysUser.getId(), null, PracticeGroupType.COME_ON_PACKAGE);
         long normalGroupNum = userStatusPracticeGroups.stream().filter(p -> GroupStatusEnum.NORMAL.equals(p.getGroupStatus())).count();
-
-        result.put("comeOnPackage", 1==student.getComeOnPackage()&&normalGroupNum<=0?1:0);
+        int comeOnPackage = student.getComeOnPackage()==null?0:student.getComeOnPackage();
+        result.put("comeOnPackage", 1==comeOnPackage&&normalGroupNum<=0?1:0);
         return succeed(result);
     }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -52,9 +52,11 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群详情")
 	@GetMapping(value = "/queryGroupDetail")
-	public Object queryGroupList(Long imGroupId) {
-
-		return succeed(imGroupService.get(imGroupId));
+	public Object queryGroupDetail(String imGroupId) {
+		if (imGroupId.contains("S") || imGroupId.contains("I")){
+			imGroupId = imGroupId.substring(1);
+		}
+		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
 	}
 
 	@ApiOperation("查询群成员列表")

mec-web/src/main/java/com/ym/mec/web/controller/ImGroupController.java

@@ -65,9 +65,11 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群详情")
 	@GetMapping(value = "/queryGroupDetail")
-	public Object queryGroupList(Long imGroupId) {
-
-		return succeed(imGroupService.get(imGroupId));
+	public Object queryGroupDetail(String imGroupId) {
+		if (imGroupId.contains("S") || imGroupId.contains("I")){
+			imGroupId = imGroupId.substring(1);
+		}
+		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
 	}
 
 	@ApiOperation("修改群信息")