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

conf/db.conf

@@ -5,7 +5,7 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = localhost
+db_addr      = 192.168.0.122
 
 ; 端口
 db_port      = 3306
@@ -26,4 +26,4 @@ dbprefix     =
 db_debug     = false
 
 ; 字符集
-char_set     = utf8
+char_set     = utf8mb4

controllers/auth.go

@@ -75,12 +75,26 @@ func (c *BaseController) authWechat(serv *service.SysServ) {
 	// 用户微信信息
 	var wxDetail map[string]interface{}
 	detailRaw := c.GetSession("wechat_user")
+
 	if detailRaw != nil {
 		wxDetail = detailRaw.(map[string]interface{})
 	}
 
+	// DEV MODE
+	wxDetail = map[string]interface{}{
+		"openid":     " OPENID",
+		" nickname":  "NICKNAME",
+		"sex":        "1",
+		"province":   "PROVINCE",
+		"city":       "CITY",
+		"country":    "COUNTRY",
+		"headimgurl": "http://thirdwx.qlogo.cn/mmopen/g3MonUZtNHkdmzicIlibx6iaFqAc56vxLSUfpb6n5WKSYVY0ChQKkiaJSgQ1dZuTOgvLLrhJbERQQ4eMsv84eavHiaiceqxibJxCfHe/46",
+		"unionid":    "o6_bmasdasdsad6_2sgVt7hMZOPfL",
+	}
+
 	if custID == "" && wxDetail == nil {
-		wxDetail = c.getWechatDetail()
+		wxDetail = c.getWechatDetail(serv)
+
 		c.SetSession("wechat_user", wxDetail)
 	}
 
@@ -148,16 +162,28 @@ func (c *BaseController) needAuth() bool {
 }
 
 // getWechatDetail 获取微信个人信息详情
-func (c *BaseController) getWechatDetail() map[string]interface{} {
+func (c *BaseController) getWechatDetail(serv *service.SysServ) map[string]interface{} {
 	// 微信 code
 	code := c.GetString("code")
 	if code == "" {
 		c.ResponseError(
 			errors.New("没有接收到微信 code"),
+			http.StatusUnauthorized,
+		)
+	}
+
+	// TODO
+	// 机构先默认写死
+	conf, err := serv.GetWeChatConfig("1")
+	if err != nil {
+		utils.LogError("查询微信配置失败: " + err.Error())
+		c.ResponseError(
+			errors.New("没有找到微信相关配置"),
 			http.StatusBadRequest,
 		)
 	}
 
+	utils.InitWeChatClient(conf)
 	usr, err := utils.GetWxUserInfo(code)
 	if err != nil {
 		c.ResponseError(

controllers/cases/case.go

@@ -1,6 +1,7 @@
 package cases
 
 import (
+	"errors"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
@@ -66,3 +67,18 @@ func (c *CaseController) DelCase() {
 	}
 	c.ResponseJSON("删除成功！")
 }
+
+// GetOrgCases 获取机构案场
+func (c *CaseController) GetOrgCases() {
+	org := c.GetString("org")
+	if org == "" {
+		c.ResponseError(errors.New("未确定机构"))
+	}
+
+	res, err := c.dao.GetAllCasesAndSales(org)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	c.ResponseJSON(res)
+}

controllers/config.go

@@ -24,15 +24,6 @@ func (c *BaseController) initConfig() {
 		c.Configer[AliYunConf] = aliConf
 	}
 
-	// 微信
-	clientType := utils.GetClientType(c.Ctx.Request)
-	if clientType == utils.ClientWechat {
-		wxConf := c.getConfig("conf/wechat.conf")
-		if wxConf != nil {
-			c.Configer[WeChatConf] = wxConf
-		}
-	}
-
 	// 短信
 	smsConf := c.getConfig("conf/sms.conf")
 	if smsConf != nil {

controllers/course/course.go

@@ -2,6 +2,7 @@ package course
 
 import (
 	"spaceofcheng/services/controllers"
+	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/course"
 )
 
@@ -17,3 +18,170 @@ type CourseController struct {
 func (c *CourseController) Constructor() {
 	c.dao = course.NewCourseServ(c.Context)
 }
+
+// GetCourseList 获取课程列表
+func (c *CourseController) GetCourseList() {
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	name := c.GetString("name")
+	typeid := c.GetString("typeid")
+	courses, err := c.dao.GetCourseList(caseids, name, typeid, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(courses)
+}
+
+// GetCourseByID 获取课程明细
+func (c *CourseController) GetCourseByID() {
+	courseid := c.GetString(":courseid")
+	info, err := c.dao.GetCourseByID(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(info)
+}
+
+// SaveCourse 保存课程
+func (c *CourseController) SaveCourse() {
+	course := model.TaCourse{}
+	if err := c.ParseForm(&course); err != nil {
+		c.ResponseError(err)
+	}
+	tagids := c.GetString("tagids")
+	newinfo, err := c.dao.SaveCourse(course, tagids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newinfo)
+}
+
+// DeleteCourse 删除课程
+func (c *CourseController) DeleteCourse() {
+	courseid := c.GetString(":courseid")
+	err := c.dao.DelCourse(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}
+
+// CoursePublic 课程发布
+func (c *CourseController) CoursePublic() {
+	courseid := c.GetString(":courseid")
+	err := c.dao.CoursePublic(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// CourseUnPublic 课程取消发布
+func (c *CourseController) CourseUnPublic() {
+	courseid := c.GetString(":courseid")
+	err := c.dao.CourseUnPublic(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// GetCourseImgs 获取课程图片
+func (c *CourseController) GetCourseImgs() {
+	courseid := c.GetString(":courseid")
+	imgs, err := c.dao.GetCourseImgs(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(imgs)
+}
+
+// SaveCourseImg 保存课程图片
+func (c *CourseController) SaveCourseImg() {
+	img := model.TaCourseImg{}
+	if err := c.ParseForm(&img); err != nil {
+		c.ResponseError(err)
+	}
+	newimg, err := c.dao.SaveCourseImg(img)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newimg)
+}
+
+// DelCourseImg 删除课程图片
+func (c *CourseController) DelCourseImg() {
+	courseid := c.GetString(":courseid")
+	err := c.dao.DelCourseImg(courseid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("操作成功！")
+}
+
+// GetCourseSchedule 获取课程排期
+func (c *CourseController) GetCourseSchedule() {
+	name := c.GetString("name")
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	date := c.GetString("date")
+	page, _ := c.GetInt("page")
+	pageSize, _ := c.GetInt("pagesize")
+	list, err := c.dao.GetCourseSchedule(name, caseids, date, page, pageSize)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetDetails 获取所有排课
+func (c *CourseController) GetDetails() {
+	caseid := c.GetString("caseid")
+	date := c.GetString("date")
+	list, err := c.dao.GetDetails(caseid, date)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// GetDetailByID 获取单个排课信息
+func (c *CourseController) GetDetailByID() {
+	detailid := c.GetString(":detailid")
+	detail, err := c.dao.GetDetailByID(detailid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(detail)
+}
+
+// SaveDetail 保存排课信息
+func (c *CourseController) SaveDetail() {
+	detail := model.TaCourseDetail{}
+	if err := c.ParseForm(&detail); err != nil {
+		c.ResponseError(err)
+	}
+	newdetail, err := c.dao.SaveDetail(detail)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(newdetail)
+}
+
+// DelCourseDetail 删除课程明细
+func (c *CourseController) DelCourseDetail() {
+	detailid := c.GetString(":detailid")
+	err := c.dao.DelCourseDetail(detailid)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("删除成功！")
+}

log/common.log

@@ -20,3 +20,8 @@
 2018/08/21 13:41:04 [E] 您没有该案场的权限！
 2018/08/21 14:26:22 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
 2018/08/21 14:27:06 [E] 用户登录失败: dial tcp 192.168.0.62:3306: connectex: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond.
+2018/08/23 19:57:03 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:00 [E] 获取人员映射账户失败: Params type error
+2018/08/23 19:58:39 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:03:16 [E] 获取人员映射账户失败: Params type error
+2018/08/23 20:05:14 [E] 获取人员映射账户失败: Params type error

models/cases/cases.go

@@ -107,3 +107,46 @@ func (m *CaseDAO) DelCase(caseid string) error {
 	_, err := m.db.Cols(cols...).Where("case_id=?", caseid).Update(caseinfo)
 	return err
 }
+
+// GetCaseByOrg 获取案场列表
+func (m *CaseDAO) GetCaseByOrg(org string) ([]model.SysCase, error) {
+	var cs []model.SysCase
+
+	if err := m.db.Where("org_id=?", org).
+		And("status=?", models.STATUS_NORMAL).
+		Asc("create_date").
+		Find(&cs); err != nil {
+		return nil, err
+	}
+
+	return cs, nil
+}
+
+type UserCase struct {
+	CaseId   string
+	CaseName string
+	UserId   string
+	UserName string
+}
+
+// GetCaseUserByType 获取案场人员
+func (m *CaseDAO) GetCaseUserByType(csIDs []string, typeID string) ([]UserCase, error) {
+	query := `
+		SELECT n.user_id, n.real_name as user_name, s.case_id, '' as case_name
+		FROM
+			td_user_type s
+		JOIN sys_user_type m ON s.type_id = m.type_id
+		JOIN sys_user n ON m.user_id = n.user_id
+		AND n.status = ?
+		WHERE
+			s.case_id IN ('` + strings.Join(csIDs, "','") + `')
+		AND s.type_id = ?
+	`
+
+	var users []UserCase
+	if err := m.db.SQL(query, models.STATUS_NORMAL, typeID).Find(&users); err != nil {
+		return nil, err
+	}
+
+	return users, nil
+}

models/constant.go

@@ -69,3 +69,17 @@ const (
 	// 推荐
 	ACCSOURCE_RECOMMEND = "recommend"
 )
+
+// 微信配置表
+const (
+	WECHAT_WX   = "wechat"
+	WECHAT_MINI = "mini"
+)
+
+// 人员类型
+const (
+	// 销售
+	USERTYPE_SALES = "sales"
+	// 主管
+	USERTYPE_MANAGER = "manager"
+)

models/course/course.go

@@ -5,6 +5,8 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"strings"
+	"time"
 
 	"github.com/go-xorm/xorm"
 )
@@ -23,11 +25,304 @@ func NewCourseDAO(ctx *utils.Context) *CourseDAO {
 	}
 }
 
+const (
+	STATUS_UNPUBLISH = 0
+)
+
+// CourseInfo 课程
+type CourseInfo struct {
+	model.TaCourse `xorm:"extends"`
+	CourseType     string
+}
+
 // GetCourseList 获取课程列表
-func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize int) ([]model.TaCourse, error) {
+func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize int) ([]CourseInfo, error) {
+	var courses []CourseInfo
+	sql := `select a.*,b.location_name from ta_course a left join td_cms_image_location b on a.location_id = b.location_id where a.case_id in ('` +
+		strings.Replace(caseids, ",", "','", -1) + `') and a.status>` + strconv.Itoa(models.STATUS_DEL)
+
+	if name != "" {
+		sql += ` and a.course_name like '%` + name + `%'`
+	}
+
+	if typeid != "" {
+		sql += ` and a.location_id='` + typeid + `'`
+	}
+
+	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(page*pageSize)
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}
+
+// GetCourseCount 获取课程总数
+func (m *CourseDAO) GetCourseCount(caseids, name, typeid string) (int, error) {
+	var course []model.TaCourse
+	dao := m.db.Where("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").And("status>" + strconv.Itoa(models.STATUS_DEL))
+
+	if name != "" {
+		dao.And("course_name like '%" + name + "%'")
+	}
+
+	if typeid != "" {
+		dao.And("location_id=?", typeid)
+	}
+	err := dao.Find(&course)
+	if err != nil {
+		return 0, err
+	}
+	if len(course) > 0 {
+		return len(course), nil
+	}
+	return 0, nil
+}
+
+// GetCourseByID 根据ID获取课程
+func (m *CourseDAO) GetCourseByID(courseid string) (*model.TaCourse, error) {
+	var course []model.TaCourse
+	err := m.db.Where("course_id=?", courseid).Find(&course)
+	if err != nil {
+		return nil, err
+	}
+	if len(course) > 0 {
+		return &course[0], nil
+	}
+	return nil, nil
+}
+
+// AddCourse 新增课程信息
+func (m *CourseDAO) AddCourse(course model.TaCourse) (*model.TaCourse, error) {
+	course.CourseId = utils.GetGUID()
+	course.CreateDate = time.Now()
+	course.Status = STATUS_UNPUBLISH
+	user := m.ctx.Get("user").(model.SysUser)
+	course.CreateUser = user.UserId
+	_, err := m.db.Insert(course)
+	return &course, err
+}
+
+// UpdateCourse 修改课程信息
+func (m *CourseDAO) UpdateCourse(course model.TaCourse) error {
+	var cols = []string{
+		"course_name",
+		"price",
+		"case_id",
+		"location_id",
+		"course_num",
+		"max_num",
+		"min_num",
+		"begin_date",
+		"end_date",
+		"course_img",
+		"course_desc",
+		"remark",
+		"is_select",
+	}
+	_, err := m.db.Cols(cols...).Where("course_id=?", course.CourseId).Update(course)
+	return err
+}
+
+// DelCourse 删除课程信息
+func (m *CourseDAO) DelCourse(courseid string) error {
+	var info = model.TaCourse{
+		CourseId: courseid,
+		Status:   models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("course_id=?", courseid).Update(info)
+	return err
+}
+
+// CoursePublic 课程发布
+func (m *CourseDAO) CoursePublic(courseid string) error {
+	var info = model.TaCourse{
+		CourseId: courseid,
+		Status:   models.STATUS_NORMAL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("course_id=?", courseid).Update(info)
+	return err
+}
+
+// CourseUnPublic 取消课程发布
+func (m *CourseDAO) CourseUnPublic(courseid string) error {
+	var info = model.TaCourse{
+		CourseId: courseid,
+		Status:   STATUS_UNPUBLISH,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("course_id=?", courseid).Update(info)
+	return err
+}
+
+// GetCourseImgs 获取课程图片
+func (m *CourseDAO) GetCourseImgs(courseid string) ([]model.TaCourseImg, error) {
+	var imgs []model.TaCourseImg
+	err := m.db.Where("course_id=?", courseid).Find(&imgs)
+	return imgs, err
+}
+
+// AddCourseImg 新增课程图片
+func (m *CourseDAO) AddCourseImg(courseimg model.TaCourseImg) (*model.TaCourseImg, error) {
+	courseimg.ImgId = utils.GetGUID()
+	_, err := m.db.Insert(courseimg)
+	return &courseimg, err
+}
+
+// UpdateCourseImg 修改课程图片
+func (m *CourseDAO) UpdateCourseImg(courseimg model.TaCourseImg) error {
+	var cols = []string{
+		"sort",
+	}
+	_, err := m.db.Cols(cols...).Where("img_id=?", courseimg.ImgId).Update(courseimg)
+	return err
+}
+
+// DelCourseImg 删除课程图片
+func (m *CourseDAO) DelCourseImg(imgid string) error {
+	sql := `delete from ta_course_img where img_id='` + imgid + `'`
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// CourseDetail 课程详情
+type CourseDetail struct {
+	model.TaCourse `xorm:"extends"`
+	CourseTags     []model.TaCourseTag
+	CourseImgs     []model.TaCourseImg
+	CourseDetail   []model.TaCourseDetail
+}
+
+// GetCourseInfo 获取课程详情
+func (m *CourseDAO) GetCourseInfo(courseid string) (*CourseDetail, error) {
+	var courses []CourseDetail
+	sql := `select * from ta_course where course_id='` + courseid + `'`
+	err := m.db.Sql(sql).Find(&courses)
+	if err != nil {
+		return nil, err
+	}
+	if len(courses) > 0 {
+		return &courses[0], nil
+	}
+	return nil, nil
+}
+
+// GetCourseDetail 获取课程明细
+func (m *CourseDAO) GetCourseDetail(courseid string) ([]model.TaCourseDetail, error) {
+	var details []model.TaCourseDetail
+	err := m.db.Where("course_id=?", courseid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&details)
+	return details, err
+}
+
+// GetDetails 获取所有的排课记录
+func (m *CourseDAO) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
+	var details []model.TaCourseDetail
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
+	return details, err
+}
+
+// GetCourseSchedule 获取需要排课的记录
+func (m *CourseDAO) GetCourseSchedule(name, caseids, date string, page, pageSize int) ([]model.TaCourse, error) {
+	var courses []model.TaCourse
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	if name != "" {
+		dao.And("course_name like '%" + name + "%'")
+	}
+	if caseids != "" {
+		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	}
+	err := dao.OrderBy("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
+	return courses, err
+}
+
+// GetCourseScheduleCount 获取排课记录数
+func (m *CourseDAO) GetCourseScheduleCount(name, caseids, date string) (int, error) {
 	var courses []model.TaCourse
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	if name != "" {
+		dao.And("course_name like '%" + name + "%'")
+	}
+	if caseids != "" {
+		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	}
+	err := dao.Find(&courses)
+	return len(courses), err
+}
 
-	m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("")
+// GetDetailByID 获取排课明细
+func (m *CourseDAO) GetDetailByID(detailid string) (*model.TaCourseDetail, error) {
+	var details []model.TaCourseDetail
+	err := m.db.Where("detail_id=?", detailid).And("status>" + strconv.Itoa(models.STATUS_DEL)).Find(&details)
+	if err != nil {
+		return nil, err
+	}
+	if len(details) > 0 {
+		return &details[0], nil
+	}
+	return nil, nil
+}
+
+// AddCourseDetail 新增明细
+func (m *CourseDAO) AddCourseDetail(detail model.TaCourseDetail) (*model.TaCourseDetail, error) {
+	detail.CreateDate = time.Now()
+	detail.Status = models.STATUS_NORMAL
+	detail.DetailId = utils.GetGUID()
+	_, err := m.db.Insert(detail)
+	return &detail, err
+}
+
+// UpdateCourseDetail 修改明细
+func (m *CourseDAO) UpdateCourseDetail(detail model.TaCourseDetail) error {
+	var cols = []string{
+		"detail_name",
+		"begin_date",
+		"end_date",
+	}
+	_, err := m.db.Cols(cols...).Where("detail_id=?", detail.DetailId).Update(detail)
+	return err
+}
+
+// DelCourseDetail 刪除明细
+func (m *CourseDAO) DelCourseDetail(detailid string) error {
+	var info = model.TaCourseDetail{
+		DetailId: detailid,
+		Status:   models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("detail_id=?", detailid).Update(info)
+	return err
+}
+
+// DelCourseTag 删除课程对应标签
+func (m *CourseDAO) DelCourseTag(courseid string) error {
+	sql := `delete from ta_course_tag where course_id='` + courseid + `'`
+	_, err := m.db.Exec(sql)
+	return err
+}
+
+// SaveCourseTag 保存课程对应标签
+func (m *CourseDAO) SaveCourseTag(coursetags []model.TaCourseTag) error {
+	_, err := m.db.Insert(coursetags)
+	return err
+}
+
+// GetCourseTag 获取课程对应标签
+func (m *CourseDAO) GetCourseTag(courseid string) ([]model.TaCourseTag, error) {
+	var coursetags []model.TaCourseTag
+	err := m.db.Where("course_id=?", courseid).Find(&coursetags)
+	return coursetags, err
+}
 
-	return courses, nil
+// CourseTagSave 保存课程对应标签
+func (m *CourseDAO) CourseTagSave(courseid, tagids string) error {
+	sql := `insert into ta_course_tag(course_id,tag_id) select '` + courseid + `',tag_id from td_course_tag where tag_id in ('` + strings.Replace(tagids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
+	_, err := m.db.Exec(sql)
+	return err
 }

models/course/tag.go

@@ -5,7 +5,6 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
-	"strings"
 )
 
 // GetTagsList 获取标签列表
@@ -29,23 +28,9 @@ func (m *CourseDAO) GetTagsCount(orgid string) (int, error) {
 }
 
 // AddCourseTag 新增课程标签
-func (m *CourseDAO) AddCourseTag(tag *model.TdCourseTag) (*model.TdCourseTag, error) {
+func (m *CourseDAO) AddCourseTag(tag model.TdCourseTag) (*model.TdCourseTag, error) {
 	tag.TagId = utils.GetGUID()
 	tag.Status = models.STATUS_NORMAL
 	_, err := m.db.Insert(tag)
-	return tag, err
-}
-
-// DelCourseTag 删除课程对应标签
-func (m *CourseDAO) DelCourseTag(courseid string) error {
-	sql := `delete ta_course_tag where course_id='` + courseid + `'`
-	_, err := m.db.Exec(sql)
-	return err
-}
-
-// CourseTagSave 保存课程对应标签
-func (m *CourseDAO) CourseTagSave(courseid, tagids string) error {
-	sql := `insert into ta_course_tag(course_id,tag_id) select '` + courseid + `',tag_id from td_course_tag where tag_id in ('` + strings.Replace(tagids, ",", "','", -1) + `') and status>` + strconv.Itoa(models.STATUS_DEL)
-	_, err := m.db.Exec(sql)
-	return err
+	return &tag, err
 }

models/model/sys_wechat_conf.go

@@ -3,10 +3,12 @@ package model
 type SysWechatConf struct {
 	ConfId string `xorm:"VARCHAR(64)"`
 	OrgId  string `xorm:"VARCHAR(64)"`
-	Type   int    `xorm:"comment('wechat 微信公众号 mini 小程序') SMALLINT(6)"`
+	Type   string `xorm:"comment('wechat 微信公众号 mini 小程序') VARCHAR(20)"`
 	Appid  string `xorm:"VARCHAR(50)"`
 	Secret string `xorm:"VARCHAR(50)"`
 	Token  string `xorm:"VARCHAR(50)"`
 	Aeskey string `xorm:"VARCHAR(100)"`
 	Wxid   string `xorm:"VARCHAR(50)"`
+	Rmark  string `xorm:"TEXT"`
+	Status int    `xorm:"SMALLINT(6)"`
 }

models/model/ta_course.go

@@ -5,23 +5,24 @@ import (
 )
 
 type TaCourse struct {
-	CourseId     string    `xorm:"not null pk VARCHAR(64)"`
-	CourseName   string    `xorm:"VARCHAR(50)"`
-	Price        float32   `xorm:"FLOAT(8,2)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	LocationName string    `xorm:"VARCHAR(50)"`
-	CourseNum    int       `xorm:"INT(11)"`
-	ScheduleNum  int       `xorm:"INT(11)"`
-	MaxNum       int       `xorm:"INT(11)"`
-	MinNum       int       `xorm:"INT(11)"`
-	BeginDate    time.Time `xorm:"DATETIME"`
-	EndDate      time.Time `xorm:"DATETIME"`
-	CourseImg    string    `xorm:"TEXT"`
-	CourseDesc   string    `xorm:"VARCHAR(500)"`
-	Remark       string    `xorm:"TEXT"`
-	IsSelect     int       `xorm:"TINYINT(1)"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-	CreateUser   string    `xorm:"VARCHAR(64)"`
+	CourseId    string    `xorm:"not null pk VARCHAR(64)"`
+	CourseName  string    `xorm:"VARCHAR(50)"`
+	Price       float32   `xorm:"FLOAT(8,2)"`
+	OrgId       string    `xorm:"VARCHAR(64)"`
+	CaseId      string    `xorm:"VARCHAR(64)"`
+	LocationId  string    `xorm:"VARCHAR(64)"`
+	CourseNum   int       `xorm:"INT(11)"`
+	ScheduleNum int       `xorm:"INT(11)"`
+	MaxNum      int       `xorm:"INT(11)"`
+	MinNum      int       `xorm:"INT(11)"`
+	BeginDate   time.Time `xorm:"DATETIME"`
+	EndDate     time.Time `xorm:"DATETIME"`
+	CourseImg   string    `xorm:"TEXT"`
+	CourseDesc  string    `xorm:"VARCHAR(500)"`
+	Remark      string    `xorm:"TEXT"`
+	IsSelect    int       `xorm:"TINYINT(1)"`
+	Status      int       `xorm:"SMALLINT(6)"`
+	CreateDate  time.Time `xorm:"DATETIME"`
+	CreateUser  string    `xorm:"VARCHAR(64)"`
+	SignupNum   int       `xorm:"INT(11)"`
 }

models/sys.go

@@ -136,7 +136,7 @@ func (m *SysDAO) UpdateUserMapping(user *model.TaUserMapping) error {
 	_, err := m.db.Cols(cols...).
 		Where("account_type=?", user.AccountType).
 		And("openid=?", user.Openid).
-		Update(&user)
+		Update(user)
 	return err
 }
 
@@ -154,3 +154,14 @@ func GetCaseByContext(ctx *utils.Context) (string, error) {
 
 	return cs.CaseId, nil
 }
+
+// GetWeChatConfig 获取微信配置
+func (m *SysDAO) GetWeChatConfig(org string) (*model.SysWechatConf, error) {
+	conf := new(model.SysWechatConf)
+
+	if _, err := m.db.Where("org_id=?", org).And("type=?", WECHAT_WX).Get(conf); err != nil {
+		return nil, err
+	}
+
+	return conf, nil
+}

routers/common.go

@@ -154,8 +154,26 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/rolemenu/:roleid", &system.RoleController{}, "put:SaveRoleMenus"),
 
 		// course 课程
-		beego.NSRouter("/course/taglist", &course.CourseController{}, "get:GetCourseTagsByPage"),
-		beego.NSRouter("/course/tag", &course.CourseController{}, "get:GetCourseTags"),
+		beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTagsByPage"),
+		// beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTags"),
+
+		beego.NSRouter("/course", &course.CourseController{}, "get:GetCourseList"),
+		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
+		beego.NSRouter("/course", &course.CourseController{}, "post:SaveCourse"),
+		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),
+		beego.NSRouter("/course/:courseid", &course.CourseController{}, "delete:DeleteCourse"),
+		beego.NSRouter("/course/:courseid/public", &course.CourseController{}, "put:CoursePublic"),
+		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "get:CourseUnPublic"),
+		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "get:GetCourseImgs"),
+		beego.NSRouter("/courseimg", &course.CourseController{}, "post:SaveCourseImg"),
+		beego.NSRouter("/courseimg", &course.CourseController{}, "put:SaveCourseImg"),
+		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "delete:DelCourseImg"),
+		beego.NSRouter("/schedule", &course.CourseController{}, "get:GetCourseSchedule"),
+		beego.NSRouter("/detail", &course.CourseController{}, "get:GetDetails"),
+		beego.NSRouter("/detail/:detailid", &course.CourseController{}, "get:GetDetailByID"),
+		beego.NSRouter("/detail", &course.CourseController{}, "post:SaveDetail"),
+		beego.NSRouter("/detail", &course.CourseController{}, "put:SaveDetail"),
+		beego.NSRouter("/detail/:detailid", &course.CourseController{}, "delete:DelCourseDetail"),
 
 		// 文件
 		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),

routers/guest.go

@@ -20,7 +20,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
 
 		// 案场
-		beego.NSRouter("/casearea", &cases.CaseController{}, "get:GetAreaByCase"),
+		beego.NSRouter("/case", &cases.CaseController{}, "get:GetOrgCases"),
 
 		// 验证码 获取, 校验
 		beego.NSRouter("/captcha", &controllers.BaseController{}, "get:SendCaptcha"),

routers/wechat.go

@@ -1,11 +1,7 @@
 package routers
 
 import (
-	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/controllers/customer"
-	"spaceofcheng/services/controllers/goods"
-	"spaceofcheng/services/controllers/message"
-	"spaceofcheng/services/controllers/user"
 
 	"github.com/astaxie/beego"
 )
@@ -14,66 +10,7 @@ func getWechatRoutes() beego.LinkNamespace {
 	prefix := beego.AppConfig.String("api::wechat")
 
 	return beego.NSNamespace(prefix,
-		// 商品分类
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "get:GetGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "get:GetGoodsTypeByID"),
-		beego.NSRouter("/type/goods", &goods.GoodsController{}, "post:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "put:SaveGoodsType"),
-		beego.NSRouter("/type/goods/:typeid", &goods.GoodsController{}, "delete:DelGoodsType"),
-
-		// 商品规格
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "get:GetGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "get:GetGoodsSpecByID"),
-		beego.NSRouter("/spec/goods", &goods.GoodsController{}, "post:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "put:SaveGoodsSpec"),
-		beego.NSRouter("/spec/goods/:specid", &goods.GoodsController{}, "delete:DelGoodsSpec"),
-
-		// 系统用户
-		beego.NSRouter("/user", &user.UserController{}, "get:GetUserList"),
-		beego.NSRouter("/user/:userid", &user.UserController{}, "get:GetUserByID"),
-		beego.NSRouter("/user/:userid/password", &user.UserController{}, "put:UpdatePassword"),
-		beego.NSRouter("/user/password/reset", &user.UserController{}, "put:ResetPassword"),
-		beego.NSRouter("/signout", &user.UserController{}, "post:SignOut"),
-
-		// cms 位置
-		beego.NSRouter("/cms/area", &message.MessageController{}, "get:GetLocations"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "get:GetLocationById"),
-		beego.NSRouter("/cms/area", &message.MessageController{}, "post:SaveLocation"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "put:SaveLocation"),
-		beego.NSRouter("/cms/area/:locationid", &message.MessageController{}, "delete:DelLocation"),
-
-		// cms
-		beego.NSRouter("/cms/info", &message.MessageController{}, "get:GetCmsInfoList"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "get:GetCmsInfoByID"),
-		beego.NSRouter("/cms/info", &message.MessageController{}, "post:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "put:SaveCmsInfo"),
-		beego.NSRouter("/cms/info/:infoid", &message.MessageController{}, "delete:DelCmsInfo"),
-
-		// cms 图片
-		beego.NSRouter("/cms/image", &message.MessageController{}, "get:GetImgList"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "get:GetImgByID"),
-		beego.NSRouter("/cms/image", &message.MessageController{}, "post:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "put:SaveImage"),
-		beego.NSRouter("/cms/image/:imgid", &message.MessageController{}, "delete:DelImg"),
-
-		// cms 消息
-		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "get:GetNewsByID"),
-		beego.NSRouter("/cms/news", &message.MessageController{}, "post:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "put:SaveNews"),
-		beego.NSRouter("/cms/news/:newsid", &message.MessageController{}, "delete:DelNews"),
-
-		// cms 案场
-		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
-		beego.NSRouter("/cms/case", &message.MessageController{}, "post:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "put:SaveCmsCase"),
-		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "delete:DelCmsCase"),
-
-		// 文件
-		beego.NSRouter("/file", &controllers.BaseController{}, "post:FileUpload"),
-
 		// 会员
-		beego.NSRouter("/customer", &customer.CustomerController{}, "get:CustWXList"),
+		beego.NSRouter("/customer", &customer.CustomerController{}, "get:GetCustWXByID"),
 	)
 }

service/cases/cases.go

@@ -1,6 +1,8 @@
 package cases
 
 import (
+	"errors"
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/cases"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/models/system"
@@ -96,3 +98,28 @@ func (s *CaseServ) DelCase(caseid string) error {
 	err := s.dao.DelCase(caseid)
 	return err
 }
+
+// GetAllCasesAndSales 获取所有案场
+func (s *CaseServ) GetAllCasesAndSales(org string) (map[string]interface{}, error) {
+	cs, err := s.dao.GetCaseByOrg(org)
+	if err != nil {
+		utils.LogError("获取案场列表失败: " + err.Error())
+		return nil, errors.New("获取案场列表失败")
+	}
+
+	csIDs := []string{}
+	for _, c := range cs {
+		csIDs = append(csIDs, c.CaseId)
+	}
+
+	users, err := s.dao.GetCaseUserByType(csIDs, models.USERTYPE_SALES)
+	if err != nil {
+		utils.LogError("获取案场销售失败: " + err.Error())
+		return nil, errors.New("获取案场销售失败")
+	}
+
+	return map[string]interface{}{
+		"cases": cs,
+		"sales": users,
+	}, nil
+}

service/course/course.go

@@ -1,8 +1,14 @@
 package course
 
 import (
+	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/course"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
+	"strings"
+
+	"github.com/astaxie/beego"
 )
 
 // CourseServ 系统处理
@@ -18,3 +24,324 @@ func NewCourseServ(ctx *utils.Context) *CourseServ {
 		dao: course.NewCourseDAO(ctx),
 	}
 }
+
+// GetCourseList 获取课程列表
+func (s *CourseServ) GetCourseList(caseids, name, typeid string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	list, err := s.dao.GetCourseList(caseids, name, typeid, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	total, err := s.dao.GetCourseCount(caseids, name, typeid)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetCourseByID 获取课程明细
+func (s *CourseServ) GetCourseByID(courseid string) (*course.CourseDetail, error) {
+	if courseid == "" {
+		return nil, utils.LogError("不存在课程信息！")
+	}
+	info, err := s.dao.GetCourseInfo(courseid)
+	if err != nil {
+		return nil, err
+	}
+	if info == nil {
+		return nil, utils.LogError("不存在课程信息！")
+	}
+	if info.Status == models.STATUS_DEL {
+		return nil, utils.LogError("课程已被删除！")
+	}
+
+	tags, err := s.dao.GetCourseTag(courseid)
+	if err != nil {
+		return nil, err
+	}
+	info.CourseTags = tags
+	details, err := s.dao.GetCourseDetail(courseid)
+	if err != nil {
+		return nil, err
+	}
+	info.CourseDetail = details
+	imgs, err := s.dao.GetCourseImgs(courseid)
+	if err != nil {
+		return nil, err
+	}
+	info.CourseImgs = imgs
+	return info, nil
+}
+
+// SaveCourse 保存课程信息
+func (s *CourseServ) SaveCourse(course model.TaCourse, tagids string) (*model.TaCourse, error) {
+	var newInfo *model.TaCourse
+	var err error
+	if course.CourseName == "" {
+		return nil, utils.LogError("课程名称不允许为空！")
+	}
+	if course.CourseImg == "" {
+		return nil, utils.LogError("课程主图不允许为空！")
+	}
+	if course.LocationId == "" {
+		return nil, utils.LogError("课程类型不允许为空！")
+	}
+	if course.CaseId == "" {
+		return nil, utils.LogError("课程案场不允许为空！")
+	}
+	if course.Price == 0 {
+		return nil, utils.LogError("课程价格不允许为0！")
+	}
+	if course.MinNum == 0 {
+		return nil, utils.LogError("最小开课人数不允许为0！")
+	}
+	if course.MaxNum == 0 {
+		return nil, utils.LogError("上课人数不允许为0！")
+	}
+	if course.MaxNum < course.MinNum {
+		return nil, utils.LogError("上课人数不允许小于最小开课人数！")
+	}
+	if course.CourseNum == 0 {
+		return nil, utils.LogError("课时数不允许为0！")
+	}
+	if course.BeginDate.IsZero() || course.EndDate.IsZero() {
+		return nil, utils.LogError("课程时间不允许为空！")
+	}
+	if course.EndDate.After(course.BeginDate) {
+		return nil, utils.LogError("截止时间必须大于开始时间！")
+	}
+	if tagids == "" {
+		return nil, utils.LogError("请选择课程标签！")
+	}
+	if course.CourseId == "" {
+		newInfo, err = s.dao.AddCourse(course)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err = s.dao.UpdateCourse(course)
+		if err != nil {
+			return nil, err
+		}
+		newInfo = &course
+		err = s.dao.DelCourseTag(course.CourseId)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	tags := strings.Split(tagids, ",")
+	var courseTags []model.TaCourseTag
+	for _, tag := range tags {
+		arr := strings.Split(tag, ":")
+		var tagid = ""
+		if len(arr) > 1 {
+			tagid = arr[1]
+		} else {
+			var taginfo = model.TdCourseTag{
+				TagName: arr[0],
+				OrgId:   course.OrgId,
+			}
+			newtag, err := s.dao.AddCourseTag(taginfo)
+			if err != nil {
+				return nil, err
+			}
+			tagid = newtag.TagId
+		}
+		var coursetag = model.TaCourseTag{
+			CourseId: course.CourseId,
+			TagId:    tagid,
+		}
+		courseTags = append(courseTags, coursetag)
+	}
+
+	if len(courseTags) > 0 {
+		err = s.dao.SaveCourseTag(courseTags)
+		return nil, err
+	}
+	return newInfo, nil
+}
+
+// DelCourse 刪除课程信息
+func (s *CourseServ) DelCourse(courseid string) error {
+	if courseid == "" {
+		return utils.LogError("没有对应的课程！")
+	}
+	err := s.dao.DelCourse(courseid)
+	return err
+}
+
+// CoursePublic 课程发布
+func (s *CourseServ) CoursePublic(courseid string) error {
+	if courseid == "" {
+		return utils.LogError("没有对应的课程！")
+	}
+	info, err := s.dao.GetCourseByID(courseid)
+	if err != nil {
+		return err
+	}
+	if info.Status != course.STATUS_UNPUBLISH {
+		return utils.LogError("当前课程状态异常！请刷新后重试！")
+	}
+	err = s.dao.CoursePublic(courseid)
+	return err
+}
+
+// CourseUnPublic 课程取消发布
+func (s *CourseServ) CourseUnPublic(courseid string) error {
+	if courseid == "" {
+		return utils.LogError("没有对应的课程！")
+	}
+	info, err := s.dao.GetCourseByID(courseid)
+	if err != nil {
+		return err
+	}
+	if info.Status != models.STATUS_NORMAL {
+		return utils.LogError("当前课程状态异常！请刷新后重试！")
+	}
+	err = s.dao.CourseUnPublic(courseid)
+	return err
+}
+
+// GetCourseImgs 获取课程图片
+func (s *CourseServ) GetCourseImgs(courseid string) ([]model.TaCourseImg, error) {
+	if courseid == "" {
+		return nil, utils.LogError("没有对应的课程！")
+	}
+	imgs, err := s.dao.GetCourseImgs(courseid)
+	return imgs, err
+}
+
+// SaveCourseImg 保存课程图片
+func (s *CourseServ) SaveCourseImg(img model.TaCourseImg) (*model.TaCourseImg, error) {
+	var newinfo *model.TaCourseImg
+	var err error
+	if img.ImgUrl == "" {
+		return nil, utils.LogError("请先上传图片！")
+	}
+	if img.ImgId == "" {
+		newinfo, err = s.dao.AddCourseImg(img)
+	} else {
+		newinfo = &img
+		err = s.dao.UpdateCourseImg(img)
+	}
+	return newinfo, err
+}
+
+// DelCourseImg 刪除课程图片
+func (s *CourseServ) DelCourseImg(imgid string) error {
+	if imgid == "" {
+		return utils.LogError("没有需要删除的内容！")
+	}
+	err := s.dao.DelCourseImg(imgid)
+	return err
+}
+
+// GetCourseSchedule 获取课程排期
+func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSize int) (map[string]interface{}, error) {
+	if pageSize == 0 {
+		pageSize = service.PAGENUM
+	}
+	if page == 0 {
+		page = 1
+	}
+	if date == "" {
+		return nil, utils.LogError("请先选择需要排课的日期！")
+	}
+	list, err := s.dao.GetCourseSchedule(name, caseids, date, page, pageSize)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+	total, err := s.dao.GetCourseScheduleCount(name, caseids, date)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+
+	return map[string]interface{}{
+		"list":     list,
+		"pagesize": pageSize,
+		"pagenum":  total,
+		"page":     page,
+	}, err
+}
+
+// GetDetails 获取所有排课
+func (s *CourseServ) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
+	if caseid == "" {
+		return nil, utils.LogError("请先选择案场！")
+	}
+	if date == "" {
+		return nil, utils.LogError("请选择需要查看的月份！")
+	}
+	details, err := s.dao.GetDetails(caseid, date)
+	return details, err
+}
+
+// GetDetailByID 获取单个排课信息
+func (s *CourseServ) GetDetailByID(detailid string) (*model.TaCourseDetail, error) {
+	if detailid == "" {
+		return nil, utils.LogError("没有对应的排课信息！")
+	}
+	detail, err := s.dao.GetDetailByID(detailid)
+	return detail, err
+}
+
+// SaveDetail 保存排课信息
+func (s *CourseServ) SaveDetail(detail model.TaCourseDetail) (*model.TaCourseDetail, error) {
+	var newinfo *model.TaCourseDetail
+	if detail.CourseId == "" {
+		return nil, utils.LogError("没有对应的课程信息！")
+	}
+	if detail.DetailName == "" {
+		return nil, utils.LogError("课程名称不能为空！")
+	}
+	if detail.BeginDate.IsZero() || detail.EndDate.IsZero() {
+		return nil, utils.LogError("课程时间不能为空！")
+	}
+	if detail.BeginDate.After(detail.EndDate) {
+		return nil, utils.LogError("课程截止时间必须大于开始时间！")
+	}
+	if detail.DetailId == "" {
+		course, err := s.dao.GetCourseByID(detail.CourseId)
+		if err != nil {
+			return nil, err
+		}
+		detail.OrgId = course.OrgId
+		detail.CaseId = course.CaseId
+		newinfo, err = s.dao.AddCourseDetail(detail)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err := s.dao.UpdateCourseDetail(detail)
+		if err != nil {
+			return nil, err
+		}
+		newinfo = &detail
+	}
+	return newinfo, nil
+}
+
+// DelCourseDetail 删除课程明细
+func (s *CourseServ) DelCourseDetail(detailid string) error {
+	if detailid == "" {
+		return utils.LogError("没有对应的排课信息！")
+	}
+	err := s.dao.DelCourseDetail(detailid)
+	return err
+}

service/sys.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"encoding/json"
+	"errors"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
@@ -128,3 +129,23 @@ func (s *SysServ) CheckWechatUserMapping(user map[string]interface{}) (*model.Ta
 
 	return &userMapping, nil
 }
+
+// GetWeChatConfig 获取微信配置
+func (s SysServ) GetWeChatConfig(org string) (map[string]string, error) {
+	conf, err := s.dao.GetWeChatConfig(org)
+	if err != nil {
+		return nil, err
+	}
+
+	if conf.ConfId == "" {
+		return nil, errors.New("未找到微信配置")
+	}
+
+	return map[string]string{
+		"appid":  conf.Appid,
+		"secret": conf.Secret,
+		"token":  conf.Token,
+		"aeskey": conf.Aeskey,
+		"wxid":   conf.Wxid,
+	}, nil
+}