wangfei 6 лет назад
Родитель
Сommit
2ae63075c1
2 измененных файлов: 6 добавлений и 4 удалений
  1. 3
    1
      models/verify/verify.go
  2. 3
    3
      routers/common.go

+ 3
- 1
models/verify/verify.go Просмотреть файл

@@ -37,12 +37,14 @@ func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page
37 37
 	a.*,
38 38
 	d.case_name,
39 39
 	b.course_name,	
40
-	c.detail_name
40
+	c.detail_name,
41
+	f.location_name
41 42
 FROM
42 43
 	ta_customer_course_detail a
43 44
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
44 45
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
45 46
 	INNER JOIN sys_case d ON d.case_id = a.case_id
47
+	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
46 48
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
47 49
 	AND a.customer_course_id = '` + customerCourseId + `'
48 50
 	and b.case_id = '` + caseid + `'`

+ 3
- 3
routers/common.go Просмотреть файл

@@ -153,9 +153,9 @@ func getCommonRoutes() beego.LinkNamespace {
153 153
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
154 154
 
155 155
 		// courseVerify 核销课程
156
-		beego.NSRouter("/verify/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
157
-		beego.NSRouter("/verify/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
158
-		beego.NSRouter("/verify", &verify.VerifyController{}, "put:VerifyCourse"),
156
+		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
157
+		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
158
+		beego.NSRouter("/verify/course", &verify.VerifyController{}, "put:VerifyCourse"),
159 159
 
160 160
 		// role 角色
161 161
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),