Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/DemoGroupService.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.page.TeacherManageDemoGroupQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -56,11 +57,13 @@ public interface DemoGroupService extends BaseService<Long, DemoGroup> {
     List<EducationDemoGroupListDto> findDemoGroupStartClassTimesWithWeekByTeacherId(Long teacherID);
 
     /**
-     * @describe 获取试老师下周的试听课
+     * @describe 获取试老师指定时间段内的试听课
      * @author Joburgess
-     * @date 2019/10/28
-     * @param teacherId:
+     * @date 2019/11/4
+     * @param teacherId: 教师编号
+     * @param startTime: 开始时间
+     * @param endTime: 结束时间
      * @return java.util.Map<java.lang.String,java.lang.Object>
      */
-    Map<String,Object> findByTeacherId(Integer teacherId);
+    Map<String,Object> findByTeacherId(Integer teacherId, Date startTime, Date endTime);
 }

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

@@ -260,17 +260,19 @@ public class DemoGroupServiceImpl extends BaseServiceImpl<Long, DemoGroup>  impl
 	}
 
 	@Override
-	public Map<String,Object> findByTeacherId(Integer teacherId) {
+	public Map<String,Object> findByTeacherId(Integer teacherId,Date startTime,Date endTime) {
 		Date now=new Date();
-		//下周一日期
-		Date nextMonday= DateUtil.getNextWeekMonday(now);
-		//下周日日期
-		Date nextSunday=DateUtil.getNextWeekSunday(now);
+		if(Objects.isNull(startTime)||Objects.isNull(endTime)){
+			//下周一日期
+			startTime= DateUtil.getNextWeekMonday(now);
+			//下周日日期
+			endTime=DateUtil.getNextWeekSunday(now);
+		}
 
 		Map<String,Object> result=new HashMap<>();
 
 		//当前教师下周的试听课计划
-		List<DemoGroupCoursesPlan> nextWeekDemoGroupCoursePlan = demoGroupCoursesPlanDao.findByDateZone(nextMonday, nextSunday, teacherId);
+		List<DemoGroupCoursesPlan> nextWeekDemoGroupCoursePlan = demoGroupCoursesPlanDao.findByDateZone(startTime, endTime, teacherId);
 		if(CollectionUtils.isEmpty(nextWeekDemoGroupCoursePlan)){
 			result.put("baseInfo",new Object());
 			result.put("list",new ArrayList<>());

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

@@ -789,8 +789,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		Map payMap = payService.getPayMap(
 				vipGroup.getTotalPrice(),
 				orderNo,
-				"https://dyme.utools.club/api-student/studentOrder/notify",
-				"https://dyme.utools.club/paymentresult?orderNo="+orderNo,
+				"http://mstudev.dayaedu.com/api-student/studentOrder/notify",
+				"http://mstudev.dayaedu.com/paymentresult?orderNo="+orderNo,
 				"vip课购买",
 				vipGroup.getName());
 		//将学员加入vip班级群组

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -58,12 +59,12 @@ public class DemoGroupController extends BaseController {
 
     @ApiOperation(value = "获取指定老师试听课")
     @GetMapping("/findByTeacherId")
-    public Object findByTeacherId(){
+    public Object findByTeacherId(Date startTime, Date endTime){
         SysUser user = sysUserFeignService.queryUserInfo();
         if(Objects.isNull(user)){
             return failed(HttpStatus.FORBIDDEN,"请登录");
         }
-        return succeed(demoGroupService.findByTeacherId(user.getId()));
+        return succeed(demoGroupService.findByTeacherId(user.getId(),startTime,endTime));
     }
 
 }