bug修改

log/common.log

@@ -142,3 +142,6 @@
 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
 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
 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
+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
+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
+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

models/course/course.go

@@ -114,6 +114,29 @@ func (m *CourseDAO) GetCourseByID(courseid string) (*model.TaCourse, error) {
 	return nil, nil
 }
 
+// CheckCourseInCardOrCoupon 判断课程是否存在于卡券种
+func (m *CourseDAO) CheckCourseInCardOrCoupon(courseid string) (bool, error) {
+	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=?`
+	var cardtarget []model.TaCouponCardTarget
+	err := m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&cardtarget)
+	if err != nil {
+		return false, err
+	}
+	if len(cardtarget) > 0 {
+		return false, nil
+	}
+	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=?`
+	var coupontarget []model.TaCouponCardTarget
+	err = m.db.Sql(sql, models.STATUS_DEL, courseid).Find(&coupontarget)
+	if err != nil {
+		return false, err
+	}
+	if len(coupontarget) > 0 {
+		return false, nil
+	}
+	return true, nil
+}
+
 // AddCourse 新增课程信息
 func (m *CourseDAO) AddCourse(course model.TaCourse) (*model.TaCourse, error) {
 	course.CourseId = utils.GetGUID()
@@ -509,6 +532,9 @@ type CustomerCourse struct {
 	OrdersNo               string
 	CaseName               string
 	CaseAddress            string
+	BeginDate              time.Time
+	EndDate                time.Time
+	Remark                 string
 	Details                []model.TaCustomerCourseDetail
 }
 
@@ -516,7 +542,7 @@ type CustomerCourse struct {
 func (m *CourseDAO) GetCustomerCourse(custID string, page, pageSize int) ([]CustomerCourse, error) {
 	var courses []CustomerCourse
 	sql := `select a.*,a.customer_course_id as qr_code_string,b.orders_no,c.course_img,d.case_address,
-	d.case_name from ta_customer_course a 
+	d.case_name,c.begin_date,c.end_date,c.remark from ta_customer_course a 
 	inner join ta_course c on a.course_id=c.course_id
 	INNER JOIN sys_case d on a.case_id = d.case_id
 	left join ta_course_orders b on a.source_id=b.orders_id
@@ -561,7 +587,10 @@ func (m *CourseDAO) GetCustomerCourseByID(id string) (*CustomerCourse, error) {
 		b.orders_no,
 		c.course_img,
 		d.case_address,
-		d.case_name
+		d.case_name,
+		c.begin_date,
+		c.end_date,
+		c.remark
 	FROM
 		ta_customer_course a
 	INNER JOIN ta_course c ON a.course_id = c.course_id

service/course/course.go

@@ -218,6 +218,14 @@ func (s *CourseServ) DelCourse(courseid string) error {
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
 		return utils.LogError("课程状态异常！不允许删除！")
 	}
+	isok, err := s.dao.CheckCourseInCardOrCoupon(courseid)
+	if err != nil {
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
+		return errors.New("判断是否绑定卡券中失败")
+	}
+	if !isok {
+		return errors.New("课程已绑定卡券，不允许删除！")
+	}
 	err = s.dao.DelCourse(courseid)
 	if err != nil {
 		utils.LogError("刪除课程信息失败: " + err.Error())
@@ -454,6 +462,14 @@ func (s *CourseServ) DelCourseDetail(detailid string) error {
 	if courseinfo.Status != course.STATUS_UNPUBLISH {
 		return utils.LogError("课程状态异常！不允许删除！")
 	}
+	isok, err := s.dao.CheckCourseInCardOrCoupon(detail.CourseId)
+	if err != nil {
+		utils.LogError("判断是否绑定卡券中失败: " + err.Error())
+		return errors.New("判断是否绑定卡券中失败")
+	}
+	if !isok {
+		return errors.New("课时已绑定卡券，不允许删除！")
+	}
 	err = s.dao.DelCourseDetail(detailid)
 	if err != nil {
 		utils.LogError("删除排课信息失败: " + err.Error())