Browse Source

签到列表

keyman1995 6 years ago
parent
commit
3c2bca04c1
4 changed files with 33 additions and 31 deletions
  1. 8
    2
      models/verify/verify.go
  2. 2
    11
      routers/guest.go
  3. 19
    16
      service/message/cmscase.go
  4. 4
    2
      service/verify/verify.go

+ 8
- 2
models/verify/verify.go View File

28
 	CourseName                   string
28
 	CourseName                   string
29
 	DetailName                   string
29
 	DetailName                   string
30
 	LocationName                 string
30
 	LocationName                 string
31
+	CustomerId                   string
31
 }
32
 }
32
 
33
 
33
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
34
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
50
 	d.case_name,
51
 	d.case_name,
51
 	b.course_name,	
52
 	b.course_name,	
52
 	c.detail_name,
53
 	c.detail_name,
53
-	f.location_name
54
+	f.location_name,
55
+	b.customer_id
54
 	FROM
56
 	FROM
55
 	ta_customer_course_detail a
57
 	ta_customer_course_detail a
56
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
58
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
103
 	a.*,
105
 	a.*,
104
 	d.case_name,
106
 	d.case_name,
105
 	b.course_name,
107
 	b.course_name,
106
-	c.detail_name
108
+	c.detail_name,
109
+	b.customer_id,
110
+	f.location_name
107
 	FROM
111
 	FROM
108
 	ta_customer_course_detail a
112
 	ta_customer_course_detail a
109
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
113
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
110
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
114
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
111
 	INNER JOIN sys_case d ON d.case_id = a.case_id
115
 	INNER JOIN sys_case d ON d.case_id = a.case_id
116
+	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
112
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
117
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
113
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
118
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
114
 	AND e.phone = '` + tel + `'
119
 	AND e.phone = '` + tel + `'
115
 	and b.case_id='` + caseid + `'`
120
 	and b.case_id='` + caseid + `'`
116
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
121
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
122
+
117
 	err := m.db.Sql(sql).Find(&courseList)
123
 	err := m.db.Sql(sql).Find(&courseList)
118
 	return courseList, err
124
 	return courseList, err
119
 }
125
 }

+ 2
- 11
routers/guest.go View File

8
 	"spaceofcheng/services/controllers/goods"
8
 	"spaceofcheng/services/controllers/goods"
9
 	"spaceofcheng/services/controllers/message"
9
 	"spaceofcheng/services/controllers/message"
10
 	"spaceofcheng/services/controllers/user"
10
 	"spaceofcheng/services/controllers/user"
11
-	"spaceofcheng/services/controllers/marketing"
12
 
11
 
13
 	"github.com/astaxie/beego"
12
 	"github.com/astaxie/beego"
14
 )
13
 )
24
 		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
23
 		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
25
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
24
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
26
 		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
25
 		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
26
+		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
27
 
27
 
28
 		// 案场
28
 		// 案场
29
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
29
 		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
43
 		beego.NSRouter("/wxsignup", &customer.CustomerController{}, "post:SignUp"),
43
 		beego.NSRouter("/wxsignup", &customer.CustomerController{}, "post:SignUp"),
44
 
44
 
45
 		// 登录
45
 		// 登录
46
-		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"),
47
-
48
-		// 营销活动 (测试,测试完可删除)
49
-		beego.NSRouter("/marketing/list",&marketing.MarketingController{},"get:GetMarketingList"),
50
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"post:SaveMarketing"),
51
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"get:GetMarketingById"),
52
-		beego.NSRouter("/marketing",&marketing.MarketingController{},"put:UpdateMarketing"),
53
-		beego.NSRouter("/marketing/normal/:activityId",&marketing.MarketingController{},"put:DelMarketingNormal"),
54
-		beego.NSRouter("/marketing/disable/:activityId",&marketing.MarketingController{},"put:DelMarketingDisable"),
55
-		beego.NSRouter("/marketing/:activityId",&marketing.MarketingController{},"delete:DelMarketing"))
46
+		beego.NSRouter("/signin", &user.UserController{}, "post:SignIn"))
56
 }
47
 }

+ 19
- 16
service/message/cmscase.go View File

63
 		beego.Error(err)
63
 		beego.Error(err)
64
 		return nil, err
64
 		return nil, err
65
 	}
65
 	}
66
-	var course []model.TaCourse
67
-	if info.IsAllCourse == 1 {
68
-		course, err = s.dao.GetCourseByCaseID(info.CaseId)
69
-	} else {
70
-		course, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
71
-	}
72
-	if err != nil {
73
-		beego.Error(err)
74
-		return nil, err
75
-	}
76
-	info.Courses = course
66
+	if info != nil {
67
+		var course []model.TaCourse
68
+		if info.IsAllCourse == 1 {
69
+			course, err = s.dao.GetCourseByCaseID(info.CaseId)
70
+		} else {
71
+			course, err = s.dao.GetCoursesByCmsCase(info.CmsCaseId)
72
+		}
73
+		if err != nil {
74
+			beego.Error(err)
75
+			return nil, err
76
+		}
77
+		info.Courses = course
77
 
78
 
78
-	imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
79
-	if err != nil {
80
-		beego.Error(err)
81
-		return nil, err
79
+		imgs, err := s.dao.GetCmsCaseImgs(info.CmsCaseId)
80
+		if err != nil {
81
+			beego.Error(err)
82
+			return nil, err
83
+		}
84
+		info.CmsCaseImgs = imgs
82
 	}
85
 	}
83
-	info.CmsCaseImgs = imgs
86
+
84
 	return info, nil
87
 	return info, nil
85
 }
88
 }
86
 
89
 

+ 4
- 2
service/verify/verify.go View File

22
 // NewVerifyServ 初始化
22
 // NewVerifyServ 初始化
23
 func NewVerifyServ(ctx *utils.Context) *VerifyServ {
23
 func NewVerifyServ(ctx *utils.Context) *VerifyServ {
24
 	return &VerifyServ{
24
 	return &VerifyServ{
25
-		ctx: ctx,
26
-		dao: verify.NewVerifyDAO(ctx),
25
+		ctx:  ctx,
26
+		dao:  verify.NewVerifyDAO(ctx),
27
+		cdao: customer.NewCustomerDAO(ctx),
27
 	}
28
 	}
28
 }
29
 }
29
 
30
 
49
 		beego.Error(err)
50
 		beego.Error(err)
50
 		return nil, err
51
 		return nil, err
51
 	}
52
 	}
53
+	beego.Error(customerId)
52
 	customer, err := s.cdao.GetCustomerByID(customerId)
54
 	customer, err := s.cdao.GetCustomerByID(customerId)
53
 	if err != nil {
55
 	if err != nil {
54
 		beego.Error(err)
56
 		beego.Error(err)