Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/verify/verify.go

@@ -21,8 +21,12 @@ func (c *VerifyController) Constructor() {
 
 // GetCustomerCourseDetailListById 根据id获取我的课程详情
 func (c *VerifyController) GetCustomerCourseDetailListById() {
-	customerCourseId := c.GetString("customerCourseId")
+	customerCourseId := c.GetString(":customerCourseId")
 	caseid := c.GetString("caseid")
+	if caseid == "" {
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
+		caseid = caseinfo.CaseId
+	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	list, err := c.dao.GetCustomerCourseDetailById(customerCourseId, caseid, page, pageSize)
@@ -36,6 +40,10 @@ func (c *VerifyController) GetCustomerCourseDetailListById() {
 // GetCustomerCourseDetailListBytel 根据手机号获取我的课程详情id
 func (c *VerifyController) GetCustomerCourseDetailListBytel() {
 	caseid := c.GetString("caseid")
+	if caseid == "" {
+		caseinfo := c.Context.Get("currentCase").(model.SysUserCase)
+		caseid = caseinfo.CaseId
+	}
 	tel := c.GetString("tel")
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")

models/model/ta_customer_course.go

@@ -11,6 +11,7 @@ type TaCustomerCourse struct {
 	OrgId            string    `xorm:"VARCHAR(64)"`
 	CaseId           string    `xorm:"VARCHAR(64)"`
 	CourseName       string    `xorm:"VARCHAR(50)"`
+	LocationId       string    `xorm:"VARCHAR(64)"`
 	Price            string    `xorm:"DECIMAL(8,2)"`
 	CourseNum        int       `xorm:"INT(11)"`
 	JoinNum          int       `xorm:"INT(11)"`

models/verify/verify.go

@@ -24,9 +24,10 @@ func NewVerifyDAO(ctx *utils.Context) *VerifyDAO {
 
 type MyCourse struct {
 	model.TaCustomerCourseDetail `xorm:"extends"`
-	caseName                     string
-	courseName                   string
-	detailName                   string
+	CaseName                     string
+	CourseName                   string
+	DetailName                   string
+	LocationName                 string
 }
 
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
@@ -55,8 +56,8 @@ FROM
 	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
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
-	AND a.customer_course_id = ` + customerCourseId + `
-	and b.case_id=` + caseid
+	AND a.customer_course_id = '` + customerCourseId + `'
+	and b.case_id = '` + caseid + `'`
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courseList)
 	return courseList, err
@@ -76,8 +77,8 @@ FROM
 	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
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
-	AND a.customer_course_id = ` + customerCourseId + `
-	and b.case_id=` + caseid
+	AND a.customer_course_id = '` + customerCourseId + `'
+	and b.case_id = '` + caseid + `'`
 	err := m.db.Sql(sql).Find(&courseList)
 	return len(courseList), err
 }
@@ -108,8 +109,8 @@ FROM
 	INNER JOIN sys_case d ON d.case_id = a.case_id
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_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
+	AND e.phone = '` + tel + `'
+	and b.case_id='` + caseid + `'`
 	sql = sql + " limit " + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courseList)
 	return courseList, err
@@ -130,8 +131,8 @@ FROM
 	INNER JOIN sys_case d ON d.case_id = a.case_id
 	INNER JOIN ta_customer e ON b.customer_id = e.customer_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
+	AND e.phone = '` + tel + `'
+	and b.case_id='` + caseid + `'`
 	err := m.db.Sql(sql).Find(&courseList)
 	return len(courseList), err
 }
@@ -167,7 +168,7 @@ FROM
 	
 	INNER JOIN ta_customer_course_detail c ON c.customer_course_id = b.customer_course_id
 WHERE  b.course_obtaim_type = 'card'
-and  c.customer_detail_id = ` + detailId
+and  c.customer_detail_id = '` + detailId + `'`
 	err := m.db.Sql(sql).Find(&customerCard)
 	return &customerCard[0], err
 
@@ -182,7 +183,7 @@ FROM
 	ta_customer_course a
 	INNER JOIN ta_customer_course_detail b ON a.customer_course_id = b.customer_course_id 
 WHERE
-	b.customer_detail_id = ` + detailId
+	b.customer_detail_id = '` + detailId + `'`
 	err := m.db.Sql(sql).Find(&customerCard)
 	return &customerCard[0], err
 }

routers/common.go

@@ -153,8 +153,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/vipcard/:vipCardChildCode", &vipcard.VipcardController{}, "put:UserCharge"),
 
 		// courseVerify 核销课程
-		beego.NSRouter("/verify/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
-		beego.NSRouter("/verify/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
+		beego.NSRouter("/verify/code/:customerCourseId", &verify.VerifyController{}, "get:GetCustomerCourseDetailListById"),
+		beego.NSRouter("/verify/tel/:tel", &verify.VerifyController{}, "get:GetCustomerCourseDetailListBytel"),
 		beego.NSRouter("/verify", &verify.VerifyController{}, "put:VerifyCourse"),
 
 		// role 角色

service/course/order.go

@@ -245,6 +245,7 @@ func (s *CourseServ) SaveOrder(order *model.TaCourseOrders, coupons []model.TaCo
 		OrgId:            order.OrgId,
 		CaseId:           order.CaseId,
 		CourseName:       course.CourseName,
+		LocationId:       course.LocationId,
 		Price:            course.Price,
 		CourseNum:        course.CourseNum,
 		JoinNum:          0,