From e79a7bba6717cc58e97c3ac38cf04880c682c57e Mon Sep 17 00:00:00 2001
From: 付智勇 <fuzhiyong@efangtec.com>
Date: Thu, 14 Sep 2017 17:31:17 +0800
Subject: [PATCH] 添加课堂
---
controller/studentMeetingController.js | 1 -
services/meetingService.js | 4 ++--
services/studentMeetingService.js | 11 +++++++++--
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/controller/studentMeetingController.js b/controller/studentMeetingController.js
index e1c1cba..013106c 100644
--- a/controller/studentMeetingController.js
+++ b/controller/studentMeetingController.js
@@ -24,7 +24,6 @@ studentMeetingController.prototype.addStudentMeeting = async(ctx, next)=>{
}
var id32 = await uuid.db32();
body.id = id32;
- body.status = 0;
body.createTime = moment(new Date()).format("YYYY-MM-DD HH:MM:SS ");
let studentMeetings= await studentMeetingService.addStudentMeeting(body);
return studentMeetings;
diff --git a/services/meetingService.js b/services/meetingService.js
index def2160..104eb5e 100644
--- a/services/meetingService.js
+++ b/services/meetingService.js
@@ -94,8 +94,8 @@ meetingService.prototype.getMeeting = async(queryData,page = 1,pageno =12) =>{
if(queryData.create_user){
sql += " and 3m_meeting.create_user = '" + queryData.create_user+"'";
}
- if(queryData.meetingType){
- sql += " and 3m_meeting.meeting_type = '" + queryData.meetingType+"'";
+ if(queryData.meetingStatus){
+ sql += " and 3m_meeting.meeting_type = '" + queryData.meetingStatus+"'";
}
sql += ' ORDER BY 3m_meeting.create_time DESC LIMIT '+(page-1)*pageno+' , ' +pageno
console.log('课堂列表',sql);
diff --git a/services/studentMeetingService.js b/services/studentMeetingService.js
index bb38b65..30ef6aa 100644
--- a/services/studentMeetingService.js
+++ b/services/studentMeetingService.js
@@ -22,8 +22,15 @@ studentMeetingService.prototype.addStudentMeeting = async(body)=>{
}
let oldSutudentMeeting = await studentMeeting.findOne({where:{studentId:body.studentId,meetingId:body.meetingId}});
if(oldSutudentMeeting){
- t.rollback();
- return {code:300,msg:'您已预约这堂课'}
+ t.rollback();
+ console
+ var error = {code:300,msg:''}
+ if(body.status == 7){
+ error.msg = '您已收藏这堂课'
+ }else{
+ error.msg = '您已预约这堂课'
+ }
+ return error
}
let Meeting = await meetingModel.findOne({where:{id:body.meetingId}});
if(!Meeting){
--
libgit2 0.24.0