Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/filter/PhoneLoginAuthenticationFilter.java

@@ -1,12 +1,9 @@
 package com.ym.mec.auth.core.filter;
 
-import java.io.IOException;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ym.mec.auth.api.dto.SysUserInfo;
+import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
+import com.ym.mec.auth.service.SysUserService;
+import com.ym.mec.common.security.SecurityConstants;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
 import org.springframework.security.authentication.AuthenticationServiceException;
 import org.springframework.security.authentication.LockedException;
@@ -15,10 +12,11 @@ import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import com.ym.mec.auth.api.dto.SysUserInfo;
-import com.ym.mec.auth.config.token.PhoneAuthenticationToken;
-import com.ym.mec.auth.service.SysUserService;
-import com.ym.mec.common.security.SecurityConstants;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 public class PhoneLoginAuthenticationFilter extends AbstractAuthenticationProcessingFilter {
 

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/core/handler/BaseAuthenticationSuccessEventHandler.java

@@ -77,7 +77,11 @@ public class BaseAuthenticationSuccessEventHandler extends SavedRequestAwareAuth
 			sysUser = sysUserService.queryByPhone(username.split(":")[1]);
 		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
-			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), null));
+			String name = sysUser.getRealName();
+			if(StringUtils.isEmpty(name)){
+				name = sysUser.getUsername();
+			}
+			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), name, null));
 			sysUser.setImToken(register.getToken());
 			sysUser.setUpdateTime(new Date());
 			sysUserService.update(sysUser);

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

@@ -1651,7 +1651,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     @Transactional(rollbackFor = Exception.class)
     public void batchAppendVipGroupCourses(VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo) {
         if (Objects.isNull(vipGroupCourseAdjustInfo.getVipGroupId())) {
-            throw new BizException("请指定小课");
+            throw new BizException("请指定课程");
         }
         if (Objects.isNull(vipGroupCourseAdjustInfo.getCourseCreateStartTime())) {
             throw new BizException("请指定排课起始时间;");
@@ -1672,17 +1672,32 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         if (courseCreateStartTime.before(today)) {
             throw new BizException("排课起始时间不能小于当前时间");
         }
-
-        VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
-        if (Objects.isNull(vipGroup)) {
-            throw new BizException("指定课程不存在");
-        }
-
-        if (vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)) {
-            throw new BizException("报名中的课程不能加课");
+        int singleClassMinutes = 0;
+        Integer schoolId = null;
+        String groupId;
+        switch (vipGroupCourseAdjustInfo.getGroupType()){
+            case PRACTICE:
+                PracticeGroup practiceGroup = practiceGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
+                if (Objects.isNull(practiceGroup)) {
+                    throw new BizException("指定课程不存在");
+                }
+                singleClassMinutes = practiceGroup.getSingleClassMinutes();
+                groupId = practiceGroup.getId().toString();
+                break;
+            default:
+                VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
+                if (Objects.isNull(vipGroup)) {
+                    throw new BizException("指定课程不存在");
+                }
+                schoolId = vipGroup.getTeacherSchoolId();
+                groupId = vipGroup.getId().toString();
+                singleClassMinutes = vipGroup.getSingleClassMinutes();
+                if (vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)) {
+                    throw new BizException("报名中的课程不能加课");
+                }
         }
 
-        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(), GroupType.VIP.getCode());
+        ClassGroup classGroup = classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(), vipGroupCourseAdjustInfo.getGroupType().getCode());
         if (Objects.isNull(classGroup)) {
             throw new BizException("对应班级不存在");
         }
@@ -1731,15 +1746,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     String dateYmdStr = DateUtil.dateToString(calendar.getTime(), DateUtil.ISO_EXPANDED_DATE_FORMAT);
                     dateYmdStr = dateYmdStr + " " + courseTime.getStartClassTime();
                     Date courseStartTime = DateUtil.stringToDate(dateYmdStr, "yyyy-MM-dd HH:mm");
-                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, vipGroup.getSingleClassMinutes());
+                    Date courseEndTime = DateUtil.addMinutes(courseStartTime, singleClassMinutes);
                     CourseSchedule courseSchedule = new CourseSchedule();
                     courseSchedule.setGroupType(GroupType.VIP);
-                    courseSchedule.setMusicGroupId(vipGroup.getId().toString());
+                    courseSchedule.setMusicGroupId(groupId);
                     courseSchedule.setClassGroupId(classGroup.getId());
                     courseSchedule.setClassDate(courseStartTime);
                     courseSchedule.setStartClassTime(courseStartTime);
                     courseSchedule.setEndClassTime(courseEndTime);
-                    courseSchedule.setSchoolId(vipGroup.getTeacherSchoolId());
+                    courseSchedule.setSchoolId(schoolId);
                     courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                     courseSchedule.setTeachMode(vipGroupCourseAdjustInfo.getTeachMode());
                     courseSchedules.add(courseSchedule);
@@ -1757,7 +1772,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //		courseScheduleDao.batchUpdate(courseSchedules);
         VipGroupApplyDto vipGroupApplyDto = new VipGroupApplyDto();
         VipGroupApplyBaseInfoDto vipGroupApplyBaseInfoDto = new VipGroupApplyBaseInfoDto();
-        vipGroupApplyBaseInfoDto.setId(vipGroup.getId());
+        vipGroupApplyBaseInfoDto.setId(Long.parseLong(groupId));
         vipGroupApplyDto.setVipGroupApplyBaseInfo(vipGroupApplyBaseInfoDto);
         vipGroupApplyDto.setCourseSchedules(courseSchedules);
         vipGroupApplyDto.setSingleClassPrice(vipGroupCourseAdjustInfo.getSingleClassPrice());

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

@@ -747,9 +747,37 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 }
                 if (money.doubleValue() > 0) {
                     String[] split = e.getCourseScheduleIds().split(",");
-                    for (int i = 0; i < split.length; i++) {
-                        rewardMap.put(Integer.parseInt(split[i]),money.doubleValue()/split.length);
-                        rewardNameMap.put(Integer.parseInt(split[i]),e.getActiveName());
+                    switch (rewardsRule.getRewardMode()) {
+                        case STAIR:
+                            List<String> list = new ArrayList(Arrays.asList(split));
+                            Collections.sort(list);
+                            int fromIndex = 0;
+                            List<String> subList;
+                            int max = 0;
+                            for (RewardsRulesJsonDto rulesJsonDto:rulesJsonDtos) {
+                                if(list.size() < fromIndex){
+                                    break;
+                                }
+                                max = rulesJsonDto.getMax();
+                                if(list.size() < rulesJsonDto.getMax()){
+                                    max = list.size();
+                                }
+                                subList = list.subList(fromIndex,max);
+                                fromIndex = rulesJsonDto.getMax();
+                                if(subList != null && subList.size() > 0){
+                                    subList.forEach(courseId->{
+                                        rewardMap.put(Integer.parseInt(courseId),rulesJsonDto.getMoney().doubleValue());
+                                        rewardNameMap.put(Integer.parseInt(courseId),e.getActiveName());
+                                    });
+                                }
+                            }
+                            break;
+                        case PER:
+                            for (int i = 0; i < split.length; i++) {
+                                rewardMap.put(Integer.parseInt(split[i]),money.doubleValue()/split.length);
+                                rewardNameMap.put(Integer.parseInt(split[i]),e.getActiveName());
+                            }
+                            break;
                     }
                 }
             });
@@ -762,9 +790,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         //vip课（梯度课酬）
         //陪练课
         exportTeacherSalaryDtos.addAll(courseScheduleTeacherSalaryDao.exportPracticeTeacherSalary(params));
+        exportTeacherSalaryDtos.sort(Comparator.comparing(ExportTeacherSalaryDto::getTeacherId));
         return exportTeacherSalaryDtos;
     }
 
+
     @Override
     public List<Long> querySettlementScheduleId(String courseScheduleIds) {
         return courseScheduleTeacherSalaryDao.querySettlementScheduleId(courseScheduleIds);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/YimeiSmsPlugin.java

@@ -26,11 +26,11 @@ public class YimeiSmsPlugin implements MessageSenderPlugin, InitializingBean {
 
 	private Logger logger = LoggerFactory.getLogger(YimeiSmsPlugin.class);
 
-	@Value("${com.properties.sms-appId:EUCP-EMY-SMS1-1AIHP}")
+	@Value("${com.properties.sms-appId:EUCP-EMY-SMS1-DX0Y9}")
 	private String appId;
-	@Value("${com.properties.sms-secretKey:CBA790799C876DAD}")
+	@Value("${com.properties.sms-secretKey:B0C8230D0F2ACC64}")
 	private String secretKey;
-	@Value("${com.properties.sms-host-dev:http://bjksmtn.b2m.cn}")
+	@Value("${com.properties.sms-host-dev:http://bjmtn.b2m.cn}")
 	private String host;
 
 	public static String getName() {