Merge remote-tracking branch 'origin/master'

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

@@ -471,7 +471,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							if (salary == null) {
 								throw new BizException("请设置老师陪练课课酬");
 							}
-							courseScheduleTeacherSalary.setExpectSalary(teacherPracticeSalaryMap.get(salary));
+							courseScheduleTeacherSalary.setExpectSalary(salary);
 						} else if (type == CourseScheduleType.VIP) {
 
 						} else {
@@ -3752,6 +3752,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			practiceGroup.setSubjectId(subjectId);
 			practiceGroupDao.update(practiceGroup);
 			ClassGroup classGroup = classGroupDao.findByMusicGroupAndType(practiceGroupId, GroupType.PRACTICE.getCode());
+			classGroup.setSubjectIdList(subjectId.toString());
 			classGroup.setName(groupName);
 			classGroup.setSubjectIdList(subjectId.toString());
 			classGroupDao.update(classGroup);

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

@@ -356,7 +356,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					}
 				}
 				//异常签退时间段，并且没有签退状态
-			}else if(DateUtil.minutesBetween(classStartDateTime,date) > 0 && DateUtil.minutesBetween(date,classEndDateCut10Minutes) > 0){
+			}else if(DateUtil.minutesBetween(classStartDateTime,date) >= 0 && DateUtil.minutesBetween(date,classEndDateCut10Minutes) > 0){
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
 			}else {
 				return;

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

@@ -259,7 +259,7 @@
 		LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
 		LEFT JOIN teacher_attendance ta ON ta.course_schedule_id_ = cs.id_
 		LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_
-		WHERE ta.id_ IS NOT NULL AND sa.id_ IS NOT NULL
+		WHERE (ta.sign_in_status_ IS NOT NULL OR ta.sign_out_status_ IS NOT NULL) AND sa.id_ IS NOT NULL
 		<if test="days!=null">
 			AND cs.class_date_ &lt;= DATE_FORMAT(DATE_ADD( NOW( ), INTERVAL - #{days} DAY ),'%Y-%m-%d')
 		</if>

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

@@ -0,0 +1,81 @@
+package com.ym.mec.web.controller;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.service.ContractService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("contracts")
+@Api(tags = "协议服务")
+@RestController
+public class ContractsController extends BaseController {
+
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@Autowired
+	private ContractService contractService;
+
+	@ApiOperation("查询注册协议")
+	@GetMapping(value = "queryRegisterContract")
+	public Object queryRegisterContract() {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(contractService.queryRegisterContract(sysUser.getId()));
+	}
+
+	@ApiOperation("查询商品协议")
+	@GetMapping(value = "queryGoodsContract")
+	public Object queryGoodsContract(String musicGroupId, String goodsIds, KitGroupPurchaseTypeEnum kitGroupPurchaseTypeEnum) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(contractService.queryGoodsContract(sysUser.getId(), musicGroupId, goodsIds, kitGroupPurchaseTypeEnum));
+	}
+
+	@ApiOperation("查询乐团课程协议")
+	@GetMapping(value = "queryMusicGroupCoursesContract")
+	public Object queryMusicGroupCoursesContract(String musicGroupId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(contractService.queryMusicGroupCoursesContract(sysUser.getId(), musicGroupId));
+	}
+
+	@ApiOperation("查询VIP课程协议")
+	@GetMapping(value = "queryVipGroupCoursesContract")
+	public Object queryVipGroupCoursesContract(Long vipGroupId) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(contractService.queryVipGroupCoursesContract(sysUser.getId(), vipGroupId));
+	}
+
+	@ApiOperation("查询陪练课课程协议")
+	@GetMapping(value = "queryPracticeCoursesContract")
+	public Object queryPracticeCoursesContract(int courseSectionNum, Date startDate, Date endDate, BigDecimal fee) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("获取用户信息失败");
+		}
+		return succeed(contractService.queryPracticeCoursesContract(sysUser.getId(), courseSectionNum, startDate, endDate, fee));
+	}
+
+}