wangfei 6 年前
父节点
当前提交
3025abacb2
共有 5 个文件被更改,包括 27 次插入16 次删除
  1. 9
    1
      controllers/verify/verify.go
  2. 1
    0
      models/model/ta_customer_course.go
  3. 14
    13
      models/verify/verify.go
  4. 2
    2
      routers/common.go
  5. 1
    0
      service/course/order.go

+ 9
- 1
controllers/verify/verify.go 查看文件

19
 	c.dao = verify.NewVerifyServ(c.Context)
19
 	c.dao = verify.NewVerifyServ(c.Context)
20
 }
20
 }
21
 func (c *VerifyController) GetCustomerCourseDetailListById() {
21
 func (c *VerifyController) GetCustomerCourseDetailListById() {
22
-	customerCourseId := c.GetString("customerCourseId")
22
+	customerCourseId := c.GetString(":customerCourseId")
23
 	caseid := c.GetString("caseid")
23
 	caseid := c.GetString("caseid")
24
+	if caseid == "" {
25
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
26
+		caseid = caseinfo.CaseId
27
+	}
24
 	page, _ := c.GetInt("page")
28
 	page, _ := c.GetInt("page")
25
 	pageSize, _ := c.GetInt("pagesize")
29
 	pageSize, _ := c.GetInt("pagesize")
26
 	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseid, page, pageSize)
30
 	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseid, page, pageSize)
33
 
37
 
34
 func (c *VerifyController) GetCustomerCourseDetailListBytel() {
38
 func (c *VerifyController) GetCustomerCourseDetailListBytel() {
35
 	caseid := c.GetString("caseid")
39
 	caseid := c.GetString("caseid")
40
+	if caseid == "" {
41
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
42
+		caseid = caseinfo.CaseId
43
+	}
36
 	tel := c.GetString("tel")
44
 	tel := c.GetString("tel")
37
 	page, _ := c.GetInt("page")
45
 	page, _ := c.GetInt("page")
38
 	pageSize, _ := c.GetInt("pagesize")
46
 	pageSize, _ := c.GetInt("pagesize")

+ 1
- 0
models/model/ta_customer_course.go 查看文件

11
 	OrgId            string    `xorm:"VARCHAR(64)"`
11
 	OrgId            string    `xorm:"VARCHAR(64)"`
12
 	CaseId           string    `xorm:"VARCHAR(64)"`
12
 	CaseId           string    `xorm:"VARCHAR(64)"`
13
 	CourseName       string    `xorm:"VARCHAR(50)"`
13
 	CourseName       string    `xorm:"VARCHAR(50)"`
14
+	LocationId       string    `xorm:"VARCHAR(64)"`
14
 	Price            string    `xorm:"DECIMAL(8,2)"`
15
 	Price            string    `xorm:"DECIMAL(8,2)"`
15
 	CourseNum        int       `xorm:"INT(11)"`
16
 	CourseNum        int       `xorm:"INT(11)"`
16
 	JoinNum          int       `xorm:"INT(11)"`
17
 	JoinNum          int       `xorm:"INT(11)"`

+ 14
- 13
models/verify/verify.go 查看文件

24
 
24
 
25
 type MyCourse struct {
25
 type MyCourse struct {
26
 	model.TaCustomerCourseDetail `xorm:"extends"`
26
 	model.TaCustomerCourseDetail `xorm:"extends"`
27
-	caseName                     string
28
-	courseName                   string
29
-	detailName                   string
27
+	CaseName                     string
28
+	CourseName                   string
29
+	DetailName                   string
30
+	LocationName                 string
30
 }
31
 }
31
 
32
 
32
 // GetCustomerCourseList 根据我的课程id获取我的课程详情
33
 // GetCustomerCourseList 根据我的课程id获取我的课程详情
43
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
44
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
44
 	INNER JOIN sys_case d ON d.case_id = a.case_id
45
 	INNER JOIN sys_case d ON d.case_id = a.case_id
45
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
46
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
46
-	AND a.customer_course_id = ` + customerCourseId + `
47
-	and b.case_id=` + caseid
47
+	AND a.customer_course_id = '` + customerCourseId + `'
48
+	and b.case_id = '` + caseid + `'`
48
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
49
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
49
 	err := m.db.Sql(sql).Find(&courseList)
50
 	err := m.db.Sql(sql).Find(&courseList)
50
 	return courseList, err
51
 	return courseList, err
64
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
65
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
65
 	INNER JOIN sys_case d ON d.case_id = a.case_id
66
 	INNER JOIN sys_case d ON d.case_id = a.case_id
66
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
67
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
67
-	AND a.customer_course_id = ` + customerCourseId + `
68
-	and b.case_id=` + caseid
68
+	AND a.customer_course_id = '` + customerCourseId + `'
69
+	and b.case_id = '` + caseid + `'`
69
 	err := m.db.Sql(sql).Find(&courseList)
70
 	err := m.db.Sql(sql).Find(&courseList)
70
 	return len(courseList), err
71
 	return len(courseList), err
71
 }
72
 }
96
 	INNER JOIN sys_case d ON d.case_id = a.case_id
97
 	INNER JOIN sys_case d ON d.case_id = a.case_id
97
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
98
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
98
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
99
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
99
-	AND e.phone = ` + tel + `
100
-	and b.case_id=` + caseid
100
+	AND e.phone = '` + tel + `'
101
+	and b.case_id='` + caseid + `'`
101
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
102
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
102
 	err := m.db.Sql(sql).Find(&courseList)
103
 	err := m.db.Sql(sql).Find(&courseList)
103
 	return courseList, err
104
 	return courseList, err
118
 	INNER JOIN sys_case d ON d.case_id = a.case_id
119
 	INNER JOIN sys_case d ON d.case_id = a.case_id
119
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
120
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
120
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
121
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
121
-	AND e.phone = ` + tel + `
122
-	and b.case_id=` + caseid
122
+	AND e.phone = '` + tel + `'
123
+	and b.case_id='` + caseid + `'`
123
 	err := m.db.Sql(sql).Find(&courseList)
124
 	err := m.db.Sql(sql).Find(&courseList)
124
 	return len(courseList), err
125
 	return len(courseList), err
125
 }
126
 }
155
 	
156
 	
156
 	INNER JOIN ta_customer_course_detail c ON c.customer_course_id = b.customer_course_id
157
 	INNER JOIN ta_customer_course_detail c ON c.customer_course_id = b.customer_course_id
157
 WHERE  b.course_obtaim_type = 'card'
158
 WHERE  b.course_obtaim_type = 'card'
158
-and  c.customer_detail_id = ` + detailId
159
+and  c.customer_detail_id = '` + detailId + `'`
159
 	err := m.db.Sql(sql).Find(&customerCard)
160
 	err := m.db.Sql(sql).Find(&customerCard)
160
 	return &customerCard[0], err
161
 	return &customerCard[0], err
161
 
162
 
170
 	ta_customer_course a
171
 	ta_customer_course a
171
 	INNER JOIN ta_customer_course_detail b ON a.customer_course_id = b.customer_course_id 
172
 	INNER JOIN ta_customer_course_detail b ON a.customer_course_id = b.customer_course_id 
172
 WHERE
173
 WHERE
173
-	b.customer_detail_id = ` + detailId
174
+	b.customer_detail_id = '` + detailId + `'`
174
 	err := m.db.Sql(sql).Find(&customerCard)
175
 	err := m.db.Sql(sql).Find(&customerCard)
175
 	return &customerCard[0], err
176
 	return &customerCard[0], err
176
 }
177
 }

+ 2
- 2
routers/common.go 查看文件

153
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
153
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
154
 
154
 
155
 		// courseVerify 核销课程
155
 		// courseVerify 核销课程
156
-		beego.NSRouter("/verify/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
157
-		beego.NSRouter("/verify/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
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"),
158
 		beego.NSRouter("/verify", &verify.VerifyController{}, "put:VerifyCourse"),
159
 
159
 
160
 		// role 角色
160
 		// role 角色

+ 1
- 0
service/course/order.go 查看文件

245
 		OrgId:            order.OrgId,
245
 		OrgId:            order.OrgId,
246
 		CaseId:           order.CaseId,
246
 		CaseId:           order.CaseId,
247
 		CourseName:       course.CourseName,
247
 		CourseName:       course.CourseName,
248
+		LocationId:       course.LocationId,
248
 		Price:            course.Price,
249
 		Price:            course.Price,
249
 		CourseNum:        course.CourseNum,
250
 		CourseNum:        course.CourseNum,
250
 		JoinNum:          0,
251
 		JoinNum:          0,