胡轶钦 6 years ago
parent
commit
d69ac2c48f
3 changed files with 8 additions and 3 deletions
  1. 2
    2
      controllers/verify/verify.go
  2. 5
    0
      models/verify/verify.go
  3. 1
    1
      routers/common.go

+ 2
- 2
controllers/verify/verify.go View File

44
 		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
44
 		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
45
 		caseid = caseinfo.CaseId
45
 		caseid = caseinfo.CaseId
46
 	}
46
 	}
47
-	tel := c.GetString("tel")
47
+	tel := c.GetString(":tel")
48
 	page, _ := c.GetInt("page")
48
 	page, _ := c.GetInt("page")
49
 	pageSize, _ := c.GetInt("pagesize")
49
 	pageSize, _ := c.GetInt("pagesize")
50
 	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseid, page, pageSize)
50
 	list, err := c.dao.GetCustomerCourseDetailByTel(tel, caseid, page, pageSize)
59
 func (c *VerifyController) VerifyCourse() {
59
 func (c *VerifyController) VerifyCourse() {
60
 	sysUser := c.Context.Get("user").(model.SysUser)
60
 	sysUser := c.Context.Get("user").(model.SysUser)
61
 	userId := sysUser.UserId
61
 	userId := sysUser.UserId
62
-	customerDetailId := c.GetString("customerDetailId")
62
+	customerDetailId := c.GetString(":customerDetailId")
63
 	customerCourseDetail, err := c.dao.GetCustomerCourseDetailByDetailId(customerDetailId)
63
 	customerCourseDetail, err := c.dao.GetCustomerCourseDetailByDetailId(customerDetailId)
64
 	if err != nil {
64
 	if err != nil {
65
 		c.ResponseError(err)
65
 		c.ResponseError(err)

+ 5
- 0
models/verify/verify.go View File

111
 	d.case_name,
111
 	d.case_name,
112
 	b.course_name,
112
 	b.course_name,
113
 	c.detail_name,
113
 	c.detail_name,
114
+<<<<<<< HEAD
114
 	e.customer_name,
115
 	e.customer_name,
115
 	e.name,
116
 	e.name,
116
 	e.phone
117
 	e.phone
118
+=======
119
+	f.location_name
120
+>>>>>>> 3222288848b3f933a4154106d71a5f0547c96ab6
117
 FROM
121
 FROM
118
 	ta_customer_course_detail a
122
 	ta_customer_course_detail a
119
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
123
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
120
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
124
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
121
 	INNER JOIN sys_case d ON d.case_id = a.case_id
125
 	INNER JOIN sys_case d ON d.case_id = a.case_id
122
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
126
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
127
+	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
123
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
128
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
124
 	AND e.phone = '` + tel + `'
129
 	AND e.phone = '` + tel + `'
125
 	and b.case_id='` + caseid + `'`
130
 	and b.case_id='` + caseid + `'`

+ 1
- 1
routers/common.go View File

155
 		// courseVerify 核销课程
155
 		// courseVerify 核销课程
156
 		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
156
 		beego.NSRouter("/verify/course/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
157
 		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
157
 		beego.NSRouter("/verify/course/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
158
-		beego.NSRouter("/verify/course", &verify.VerifyController{}, "put:VerifyCourse"),
158
+		beego.NSRouter("/verify/course/:customerDetailId", &verify.VerifyController{}, "put:VerifyCourse"),
159
 
159
 
160
 		// role 角色
160
 		// role 角色
161
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),
161
 		beego.NSRouter("/role", &system.RoleController{}, "get:GetRoleList"),