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

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

@@ -1878,10 +1878,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						int unitMinutes = 30;
 
 						// 如果当前教师是在指定日期之后入职的，则按照3.0的方式结算
-						Teacher teacher = teacherMap.get(teacherId);
-						if (Objects.nonNull(teacher.getEntryDate())
-								&& (teacher.getEntryDate().after(entryDate) || teacher.getEntryDate().getTime() == entryDate.getTime())) {
-							settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();
+						if (newCourseSchedule.getType() != CourseScheduleType.CLASSROOM) {
+							Teacher teacher = teacherMap.get(teacherId);
+							if (Objects.nonNull(teacher.getEntryDate())
+									&& (teacher.getEntryDate().after(entryDate) || teacher.getEntryDate().getTime() == entryDate.getTime())) {
+								settlementType = SalarySettlementTypeEnum.GRADIENT_SALARY.getCode();
+							}
 						}
 						if (StringUtils.equals(settlementType, "TEACHER_DEFAULT")) {
 							if (newCourseSchedule.getType() == CourseScheduleType.CLASSROOM) {

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

@@ -3088,6 +3088,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         practiceBuyResult.setOrderNo(orderNo);
         practiceBuyResult.setStatus(order.getStatus());
         practiceBuyResult.setCreateTime(order.getCreateTime());
+        practiceBuyResult.setPrice(order.getExpectAmount());
         if(order.getStatus().equals(DealStatusEnum.FAILED)){
             return practiceBuyResult;
         }
@@ -3193,6 +3194,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 needUpdateGroups.add(historyPracticeGroup);
             }
         }
-        practiceGroupDao.batchUpdate(needUpdateGroups);
+        if(!CollectionUtils.isEmpty(needUpdateGroups)){
+            practiceGroupDao.batchUpdate(needUpdateGroups);
+        }
     }
 }

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

@@ -66,7 +66,7 @@
 		<foreach collection="groups" item="group" separator=";">
 			UPDATE practice_group
 			<set>
-				<if test="groupStatus!=null">
+				<if test="group.groupStatus!=null">
 					group_status_=#{group.groupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 				</if>
 				update_time_ = NOW()

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -73,6 +73,6 @@ public interface TaskRemoteService {
 	public void teacherCourseStatistic();
 
 	//更新历史陪练课至已结束
-	@GetMapping("/updateHistoryPracticeGroupStatus")
+	@GetMapping("task/updateHistoryPracticeGroupStatus")
 	public void updateHistoryPracticeGroupStatus();
 }

mec-task/src/main/java/com/ym/mec/task/jobs/UpdateHistoryPracticeGroupStatusTask.java

@@ -4,11 +4,13 @@ import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * @Author Joburgess
  * @Date 2020/2/23
  */
+@Service
 public class UpdateHistoryPracticeGroupStatusTask extends BaseTask {
 
     @Autowired