Browse Source

bug修改

wangfei 6 years ago
parent
commit
d213629c58
3 changed files with 50 additions and 2 deletions
  1. 3
    0
      log/common.log
  2. 31
    2
      models/course/course.go
  3. 16
    0
      service/course/course.go

+ 3
- 0
log/common.log View File

142
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
142
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
143
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
143
 2018/09/20 15:40:24 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
144
 2018/09/20 15:40:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
144
 2018/09/20 15:40:25 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
145
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
146
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36
147
+2018/09/20 16:53:56 [E] User-Agent: mozilla/5.0 (windows nt 10.0; win64; x64) applewebkit/537.36 (khtml, like gecko) chrome/68.0.3440.106 safari/537.36

+ 31
- 2
models/course/course.go View File

114
 	return nil, nil
114
 	return nil, nil
115
 }
115
 }
116
 
116
 
117
+// CheckCourseInCardOrCoupon 判断课程是否存在于卡券种
118
+func (m *CourseDAO) CheckCourseInCardOrCoupon(courseid string) (bool, error) {
119
+	sql := `select a.* from ta_coupon_card_target a inner join ta_coupon_card b on a.card_id=b.card_id where b.status>? and a.target_id=?`
120
+	var cardtarget []model.TaCouponCardTarget
121
+	err := m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&cardtarget)
122
+	if err != nil {
123
+		return false, err
124
+	}
125
+	if len(cardtarget) > 0 {
126
+		return false, nil
127
+	}
128
+	sql = `select a.* from ta_coupon_target a inner join ta_coupon b on a.coupon_id=b.coupon_id where b.status>? and a.target_id=?`
129
+	var coupontarget []model.TaCouponCardTarget
130
+	err = m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&coupontarget)
131
+	if err != nil {
132
+		return false, err
133
+	}
134
+	if len(coupontarget) > 0 {
135
+		return false, nil
136
+	}
137
+	return true, nil
138
+}
139
+
117
 // AddCourse 新增课程信息
140
 // AddCourse 新增课程信息
118
 func (m *CourseDAO) AddCourse(course model.TaCourse) (*model.TaCourse, error) {
141
 func (m *CourseDAO) AddCourse(course model.TaCourse) (*model.TaCourse, error) {
119
 	course.CourseId = utils.GetGUID()
142
 	course.CourseId = utils.GetGUID()
509
 	OrdersNo               string
532
 	OrdersNo               string
510
 	CaseName               string
533
 	CaseName               string
511
 	CaseAddress            string
534
 	CaseAddress            string
535
+	BeginDate              time.Time
536
+	EndDate                time.Time
537
+	Remark                 string
512
 	Details                []model.TaCustomerCourseDetail
538
 	Details                []model.TaCustomerCourseDetail
513
 }
539
 }
514
 
540
 
516
 func (m *CourseDAO) GetCustomerCourse(custID string, page, pageSize int) ([]CustomerCourse, error) {
542
 func (m *CourseDAO) GetCustomerCourse(custID string, page, pageSize int) ([]CustomerCourse, error) {
517
 	var courses []CustomerCourse
543
 	var courses []CustomerCourse
518
 	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img,d.case_address,
544
 	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img,d.case_address,
519
-	d.case_name from ta_customer_course a 
545
+	d.case_name,c.begin_date,c.end_date,c.remark from ta_customer_course a 
520
 	inner join ta_course c on a.course_id=c.course_id
546
 	inner join ta_course c on a.course_id=c.course_id
521
 	INNER JOIN sys_case d on a.case_id = d.case_id
547
 	INNER JOIN sys_case d on a.case_id = d.case_id
522
 	left join ta_course_orders b on a.source_id=b.orders_id
548
 	left join ta_course_orders b on a.source_id=b.orders_id
561
 		b.orders_no,
587
 		b.orders_no,
562
 		c.course_img,
588
 		c.course_img,
563
 		d.case_address,
589
 		d.case_address,
564
-		d.case_name
590
+		d.case_name,
591
+		c.begin_date,
592
+		c.end_date,
593
+		c.remark
565
 	FROM
594
 	FROM
566
 		ta_customer_course a
595
 		ta_customer_course a
567
 	INNER JOIN ta_course c ON a.course_id = c.course_id
596
 	INNER JOIN ta_course c ON a.course_id = c.course_id

+ 16
- 0
service/course/course.go View File

218
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
218
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
219
 		return utils.LogError("课程状态异常!不允许删除!")
219
 		return utils.LogError("课程状态异常!不允许删除!")
220
 	}
220
 	}
221
+	isok, err := s.dao.CheckCourseInCardOrCoupon(courseid)
222
+	if err != nil {
223
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
224
+		return errors.New("判断是否绑定卡券中失败")
225
+	}
226
+	if !isok {
227
+		return errors.New("课程已绑定卡券,不允许删除!")
228
+	}
221
 	err = s.dao.DelCourse(courseid)
229
 	err = s.dao.DelCourse(courseid)
222
 	if err != nil {
230
 	if err != nil {
223
 		utils.LogError("刪除课程信息失败: " + err.Error())
231
 		utils.LogError("刪除课程信息失败: " + err.Error())
454
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
462
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
455
 		return utils.LogError("课程状态异常!不允许删除!")
463
 		return utils.LogError("课程状态异常!不允许删除!")
456
 	}
464
 	}
465
+	isok, err := s.dao.CheckCourseInCardOrCoupon(detail.CourseId)
466
+	if err != nil {
467
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
468
+		return errors.New("判断是否绑定卡券中失败")
469
+	}
470
+	if !isok {
471
+		return errors.New("课时已绑定卡券,不允许删除!")
472
+	}
457
 	err = s.dao.DelCourseDetail(detailid)
473
 	err = s.dao.DelCourseDetail(detailid)
458
 	if err != nil {
474
 	if err != nil {
459
 		utils.LogError("删除排课信息失败: " + err.Error())
475
 		utils.LogError("删除排课信息失败: " + err.Error())