verify

controllers/verify/verify.go

@@ -44,7 +44,7 @@ func (c *VerifyController) GetCustomerCourseDetailListBytel() {
 		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
 		caseid = caseinfo.CaseId
 	}
-	tel := c.GetString("tel")
+	tel := c.GetString(":tel")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseid, page, pageSize)
@@ -59,7 +59,7 @@ func (c *VerifyController) GetCustomerCourseDetailListBytel() {
 func (c *VerifyController) VerifyCourse() {
 	sysUser := c.Context.Get("user").(model.SysUser)
 	userId := sysUser.UserId
-	customerDetailId := c.GetString("customerDetailId")
+	customerDetailId := c.GetString(":customerDetailId")
 	customerCourseDetail, err := c.dao.GetCustomerCourseDetailByDetailId(customerDetailId)
 	if err != nil {
 		c.ResponseError(err)

models/verify/verify.go

@@ -111,15 +111,20 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSiz
 	d.case_name,
 	b.course_name,
 	c.detail_name,
+<<<<<<< HEAD
 	e.customer_name,
 	e.name,
 	e.phone
+=======
+	f.location_name
+>>>>>>> 3222288848b3f933a4154106d71a5f0547c96ab6
 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 + `'`

routers/common.go

@@ -155,7 +155,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// courseVerify 核销课程
 		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
 		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
-		beego.NSRouter("/verify/course", &verify.VerifyController{}, "put:VerifyCourse"),
+		beego.NSRouter("/verify/course/:customerDetailId", &verify.VerifyController{}, "put:VerifyCourse"),
 
 		// role 角色
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),