正在显示
3 个修改的文件
包含
11 行增加
和
5 行删除
| @@ -24,7 +24,6 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{ | @@ -24,7 +24,6 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{ | ||
| 24 | } | 24 | } |
| 25 | var id32 = await uuid.db32(); | 25 | var id32 = await uuid.db32(); |
| 26 | body.id = id32; | 26 | body.id = id32; |
| 27 | - body.status = 0; | ||
| 28 | body.createTime = moment(new Date()).format("YYYY-MM-DD HH:MM:SS "); | 27 | body.createTime = moment(new Date()).format("YYYY-MM-DD HH:MM:SS "); |
| 29 | let studentMeetings= await studentMeetingService.addStudentMeeting(body); | 28 | let studentMeetings= await studentMeetingService.addStudentMeeting(body); |
| 30 | return studentMeetings; | 29 | return studentMeetings; |
| @@ -94,8 +94,8 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | @@ -94,8 +94,8 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{ | ||
| 94 | if(queryData.create_user){ | 94 | if(queryData.create_user){ |
| 95 | sql += " and 3m_meeting.create_user = '" + queryData.create_user+"'"; | 95 | sql += " and 3m_meeting.create_user = '" + queryData.create_user+"'"; |
| 96 | } | 96 | } |
| 97 | - if(queryData.meetingType){ | ||
| 98 | - sql += " and 3m_meeting.meeting_type = '" + queryData.meetingType+"'"; | 97 | + if(queryData.meetingStatus){ |
| 98 | + sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'"; | ||
| 99 | } | 99 | } |
| 100 | sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno | 100 | sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno |
| 101 | console.log('课堂列表',sql); | 101 | console.log('课堂列表',sql); |
| @@ -22,8 +22,15 @@ studentMeetingService.prototype.addStudentMeeting = async(body)=>{ | @@ -22,8 +22,15 @@ studentMeetingService.prototype.addStudentMeeting = async(body)=>{ | ||
| 22 | } | 22 | } |
| 23 | let oldSutudentMeeting = await studentMeeting.findOne({where:{studentId:body.studentId,meetingId:body.meetingId}}); | 23 | let oldSutudentMeeting = await studentMeeting.findOne({where:{studentId:body.studentId,meetingId:body.meetingId}}); |
| 24 | if(oldSutudentMeeting){ | 24 | if(oldSutudentMeeting){ |
| 25 | - t.rollback(); | ||
| 26 | - return {code:300,msg:'您已预约这堂课'} | 25 | + t.rollback(); |
| 26 | + console | ||
| 27 | + var error = {code:300,msg:''} | ||
| 28 | + if(body.status == 7){ | ||
| 29 | + error.msg = '您已收藏这堂课' | ||
| 30 | + }else{ | ||
| 31 | + error.msg = '您已预约这堂课' | ||
| 32 | + } | ||
| 33 | + return error | ||
| 27 | } | 34 | } |
| 28 | let Meeting = await meetingModel.findOne({where:{id:body.meetingId}}); | 35 | let Meeting = await meetingModel.findOne({where:{id:body.meetingId}}); |
| 29 | if(!Meeting){ | 36 | if(!Meeting){ |
-
请 注册 或 登录 后发表评论