签到列表

models/verify/verify.go

@@ -28,6 +28,7 @@ type MyCourse struct {
 	CourseName                   string
 	DetailName                   string
 	LocationName                 string
+	CustomerId                   string
 }
 
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
@@ -50,7 +51,8 @@ func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page
 	d.case_name,
 	b.course_name,	
 	c.detail_name,
-	f.location_name
+	f.location_name,
+	b.customer_id
 	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
@@ -103,17 +105,21 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSiz
 	a.*,
 	d.case_name,
 	b.course_name,
-	c.detail_name
+	c.detail_name,
+	b.customer_id,
+	f.location_name
 	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
 	INNER JOIN sys_case d ON d.case_id = a.case_id
+	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND e.phone = '` + tel + `'
 	and b.case_id='` + caseid + `'`
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
 	err := m.db.Sql(sql).Find(&courseList)
 	return courseList, err
 }

routers/guest.go

@@ -8,7 +8,6 @@ import (
 	"spaceofcheng/services/controllers/goods"
 	"spaceofcheng/services/controllers/message"
 	"spaceofcheng/services/controllers/user"
-	"spaceofcheng/services/controllers/marketing"
 
 	"github.com/astaxie/beego"
 )
@@ -24,6 +23,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
 		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
 
 		// 案场
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
@@ -43,14 +43,5 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/wxsignup", &customer.CustomerController{}, "post:SignUp"),
 
 		// 登录
-		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"),
-
-		// 营销活动 (测试,测试完可删除)
-		beego.NSRouter("/marketing/list",&marketing.MarketingController{},"get:GetMarketingList"),
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"post:SaveMarketing"),
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"get:GetMarketingById"),
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"put:UpdateMarketing"),
-		beego.NSRouter("/marketing/normal/:activityId",&marketing.MarketingController{},"put:DelMarketingNormal"),
-		beego.NSRouter("/marketing/disable/:activityId",&marketing.MarketingController{},"put:DelMarketingDisable"),
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"delete:DelMarketing"))
+		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"))
 }

service/message/cmscase.go

@@ -63,24 +63,27 @@ func (s *MessageServ) GetCmsCasesByID(cmscaseid string) (*message.CmsCase, error
 		beego.Error(err)
 		return nil, err
 	}
-	var course []model.TaCourse
-	if info.IsAllCourse == 1 {
-		course, err = s.dao.GetCourseByCaseID(info.CaseId)
-	} else {
-		course, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
-	}
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
-	info.Courses = course
+	if info != nil {
+		var course []model.TaCourse
+		if info.IsAllCourse == 1 {
+			course, err = s.dao.GetCourseByCaseID(info.CaseId)
+		} else {
+			course, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
+		}
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		info.Courses = course
 
-	imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
+		imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
+		if err != nil {
+			beego.Error(err)
+			return nil, err
+		}
+		info.CmsCaseImgs = imgs
 	}
-	info.CmsCaseImgs = imgs
+
 	return info, nil
 }
 

service/verify/verify.go

@@ -22,8 +22,9 @@ type VerifyServ struct {
 // NewVerifyServ 初始化
 func NewVerifyServ(ctx *utils.Context) *VerifyServ {
 	return &VerifyServ{
-		ctx: ctx,
-		dao: verify.NewVerifyDAO(ctx),
+		ctx:  ctx,
+		dao:  verify.NewVerifyDAO(ctx),
+		cdao: customer.NewCustomerDAO(ctx),
 	}
 }
 
@@ -49,6 +50,7 @@ func (s *VerifyServ) GetCustomerCourseDetailById(id, caseid string, page, pageSi
 		beego.Error(err)
 		return nil, err
 	}
+	beego.Error(customerId)
 	customer, err := s.cdao.GetCustomerByID(customerId)
 	if err != nil {
 		beego.Error(err)