ketBindCard

controllers/auth.go

@@ -49,5 +49,11 @@ func (c *BaseController) SetTokenExipre(uid string) {
 
 // CreateNewToken 新 token
 func (c *BaseController) CreateNewToken() {
-	c.Context.Set("token", c.serv.NewToken())
+
+	batchNo := ""
+	if c.Context.Get("token-batch") != nil {
+		batchNo = c.Context.Get("token-batch").(string)
+	}
+
+	c.Context.Set("token", c.serv.NewToken(batchNo))
 }

controllers/course/course.go

@@ -238,3 +238,18 @@ func (c *CourseController) GetCustomerCourseByID() {
 	}
 	c.ResponseJSON(info)
 }
+
+// GetCourseBySendType 根据类型获取课程信息
+func (c *CourseController) GetCourseBySendType() {
+	typeval := c.GetString("type")
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	courses, err := c.serv.GetCourseBySendType(typeval, caseids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(courses)
+}

controllers/message/location.go

@@ -60,3 +60,12 @@ func (c *MessageController) UpdateLocationSort() {
 	}
 	c.ResponseJSON("操作成功！")
 }
+
+// GetLocationInfoList 根据位置信息
+func (c *MessageController) GetLocationInfoList() {
+	infos, err := c.dao.GetLocationInfoList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(infos)
+}

controllers/user/user.go

@@ -9,6 +9,8 @@ import (
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 	"time"
+
+	"github.com/yl10/kit/guid"
 )
 
 // UserController 用户
@@ -185,6 +187,7 @@ func (c *UserController) SignIn() {
 
 	// 成功之后, 设置用户
 	c.Context.Set("user", *user)
+	c.Context.Set("token-batch", guid.NewGUIDString())
 
 	if token == "" && doRemember != 0 {
 		var err error

models/card/card.go

@@ -229,8 +229,8 @@ type CaseUsableCard struct {
 // GetCaseUsableCard 获取案场可用卡信息
 func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) ([]CaseUsableCard, error) {
 	var cards []CaseUsableCard
-	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&cards)
+	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() and send_type=? order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&cards)
 	for inx, card := range cards {
 		if userid != "" {
 			cCards, err := m.GetCustomerCardByCardAndUser(card.CardId, userid)
@@ -251,8 +251,8 @@ func (m *CardDAO) GetCaseUsableCard(caseid, userid string, page, pageSize int) (
 // GetCaseUsableCardCount 获取案场可用卡数量
 func (m *CardDAO) GetCaseUsableCardCount(caseid, userid string) (int, error) {
 	var Coupons []CaseUsableCard
-	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now()`
-	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	sql := `select * from ta_coupon_card where case_id=? and status=? and end_date>now() and send_type=?`
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 	return len(Coupons), err
 }
 

models/coupon/coupon.go

@@ -291,8 +291,8 @@ func (m *CouponDAO) GetCouponBySendType(caseids, sendtype string) ([]model.TaCou
 // GetCaseUsableCoupon 获取案场可用优惠券信息
 func (m *CouponDAO) GetCaseUsableCoupon(caseid, userid string, page, pageSize int) ([]CaseCouponDetail, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
-	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() and send_type=? order by create_date limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 	for inx, coupon := range Coupons {
 		if userid != "" {
 			cCoupons, err := m.GetCustomerCouponByCouponAndUser(coupon.CouponId, userid)
@@ -320,8 +320,8 @@ func (m *CouponDAO) GetCouponShareByCouponID(couponid string) (*model.TaCouponSh
 // GetCaseUsableCouponCount 获取案场可用优惠券数量
 func (m *CouponDAO) GetCaseUsableCouponCount(caseid, userid string) (int, error) {
 	var Coupons []CaseCouponDetail
-	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now()`
-	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL).Find(&Coupons)
+	sql := `select * from ta_coupon where case_id=? and status=? and end_date>now() and send_type=?`
+	err := m.db.Sql(sql, caseid, models.STATUS_NORMAL, models.GIVE_TYPE_CASE).Find(&Coupons)
 
 	return len(Coupons), err
 }

models/course/course.go

@@ -567,3 +567,41 @@ func (m *CourseDAO) GetCustomerCourseByID(id string) (*CustomerCourse, error) {
 
 	return nil, nil
 }
+
+// GetCourseBySendType 根据发送类型获取案场信息
+func (m *CourseDAO) GetCourseBySendType(typeval, caseids string) ([]model.TaCourse, error) {
+	var courses []model.TaCourse
+	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&courses)
+	return courses, err
+}
+
+// CourseWithCase 课程with案场
+type CourseWithCase struct {
+	model.TaCourse `xorm:"extends"`
+	CaseName       string
+	CaseAddress    string
+}
+
+// GetSelectCourseWithCaseList 获取精选课程
+func (m *CourseDAO) GetSelectCourseWithCaseList(orgid string) ([]CourseWithCase, error) {
+	var courses []CourseWithCase
+	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.is_select=` + strconv.Itoa(IS_SELECT) + ` 
+	and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.org_id='` + orgid + `'
+	and a.course_id NOT in (
+		select course_id from ta_course_detail where begin_date<=NOW()
+	)`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}
+
+// GetCourseWithCaseByLocation 根据位置获取课程信息
+func (m *CourseDAO) GetCourseWithCaseByLocation(orgid, locationid string) ([]CourseWithCase, error) {
+	var courses []CourseWithCase
+	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` 
+	and a.org_id='` + orgid + `' and a.location_id ='` + locationid + `' 
+	and a.course_id NOT in (
+		select course_id from ta_course_detail where begin_date<=NOW()
+	)`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}

models/message/location.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
@@ -110,3 +111,22 @@ func (m *MessageDAO) UpdateLocationSortByID(orderno int) error {
 	_, err := m.db.Exec(sql)
 	return err
 }
+
+// LocationInfo 详情
+type LocationInfo struct {
+	model.TdCmsImageLocation `xorm:"extends"`
+	Banners                  []model.TaCmsImages
+	News                     []model.TaCmsNews
+	Courses                  []course.CourseWithCase
+}
+
+// GetLocationInfoList 获取列表
+func (m *MessageDAO) GetLocationInfoList(orgid string) ([]LocationInfo, error) {
+	var locations []LocationInfo
+	sql := `select * from td_cms_image_location where status>? and location_id<>'index' and org_id=? order by order_no asc`
+	err := m.db.Sql(sql, models.STATUS_DEL, orgid).Find(&locations)
+	if err != nil {
+		return nil, err
+	}
+	return locations, nil
+}

models/model/sys_token_log.go

@@ -8,4 +8,6 @@ type SysTokenLog struct {
 	Uid        string    `xorm:"VARCHAR(64)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
+	ExpireDate time.Time `xorm:"DATETIME"`
+	BatchNo    string    `xorm:"VARCHAR(64)"`
 }

models/sys.go

@@ -3,6 +3,7 @@ package models
 import (
 	"errors"
 	"spaceofcheng/services/models/model"
+	"strings"
 	"time"
 
 	"github.com/yl10/kit/guid"
@@ -136,10 +137,12 @@ func GetWeChatConfig(org, cliType string) (*model.SysWechatConf, error) {
 }
 
 // InsertToken 插入 token 生成记录
-func InsertToken(token, uid string) error {
+func InsertToken(token, uid, batchNo string, expire time.Time) error {
 	tk := model.SysTokenLog{
 		Token:      token,
 		Uid:        uid,
+		BatchNo:    batchNo,
+		ExpireDate: expire,
 		Status:     STATUS_NORMAL,
 		CreateDate: time.Now().Local(),
 	}
@@ -157,6 +160,35 @@ func UpdateTokenExpire(token, uid string) error {
 		Status: STATUS_DEL,
 	}
 
+	// 检索相同批次
+	var tkLogs []model.SysTokenLog
+	if err := DBEngine.Where("token=?", token).Find(&tkLogs); err != nil {
+		return err
+	}
+
+	// 如果有相同批次的, 则更新本批次为失效
+	if tkLogs != nil && len(tkLogs) > 0 {
+		batchNo := []string{}
+
+		for _, t := range tkLogs {
+			if t.BatchNo != "" {
+				batchNo = append(batchNo, t.BatchNo)
+			}
+		}
+
+		if len(batchNo) > 0 {
+
+			if _, err := DBEngine.Cols("status").
+				Where("token=?", token).
+				Or("batch_no in ('" + strings.Join(batchNo, "','") + "'").
+				Update(&tk); err != nil {
+				return err
+			}
+
+			return nil
+		}
+	}
+
 	if _, err := DBEngine.Cols("status").Where("token=?", token).Or("uid=?", uid).Update(&tk); err != nil {
 		return err
 	}

routers/common.go

@@ -212,6 +212,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// beego.NSRouter("/coursetag", &course.CourseController{}, "get:GetCourseTags"),
 
 		beego.NSRouter("/course", &course.CourseController{}, "get:GetCourseList"),
+		beego.NSRouter("/course/sendtype/:type", &course.CourseController{}, "get:GetCourseBySendType"),
 		beego.NSRouter("/course/:courseid", &course.CourseController{}, "get:GetCourseByID"),
 		beego.NSRouter("/course", &course.CourseController{}, "post:SaveCourse"),
 		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),

routers/guest.go

@@ -23,6 +23,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
 		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/cms/location/detail", &message.MessageController{}, "get:GetLocationInfoList"),
 		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
 

service/cases/area.go

@@ -62,7 +62,15 @@ func (s *CaseServ) SaveCaseArea(area model.SysCaseArea) (*model.SysCaseArea, err
 
 // DelCaseArea 删除区域
 func (s *CaseServ) DelCaseArea(areaid string) error {
-	err := s.dao.DelCaseArea(areaid)
+	areas, err := s.dao.GetCaseTableByAreaID(areaid)
+	if err != nil {
+		utils.LogError("获取区域失败: " + err.Error())
+		return errors.New("获取区域失败")
+	}
+	if len(areas) > 0 {
+		return errors.New("区域下存在桌位信息，不允许删除！")
+	}
+	err = s.dao.DelCaseArea(areaid)
 	if err != nil {
 		utils.LogError("删除案场区域失败: " + err.Error())
 		return errors.New("删除案场区域失败")

service/course/course.go

@@ -552,3 +552,13 @@ func (s *CourseServ) GetCustomerCourseByID(id string) (*course.CustomerCourse, e
 	}
 	return info, err
 }
+
+// GetCourseBySendType 根据类型获取课程
+func (s *CourseServ) GetCourseBySendType(typeval, caseids string) ([]model.TaCourse, error) {
+	courses, err := s.dao.GetCourseBySendType(typeval, caseids)
+	if err != nil {
+		utils.LogError("获取课程信息失败: " + err.Error())
+		return nil, errors.New("获取课程信息失败")
+	}
+	return courses, err
+}

service/message/image.go

@@ -71,7 +71,12 @@ func (s *MessageServ) SaveImg(imginfo model.TaCmsImages) (*model.TaCmsImages, er
 	if imginfo.ForwardType == ForwardTypeUrl && imginfo.ForwardUrl == "" {
 		return nil, errors.New("跳转地址不允许为空！")
 	}
+<<<<<<< HEAD
 	if imginfo.ForwardType == ForwardTypeCourse && imginfo.CaseId == "" {
+=======
+
+	if imginfo.ForwardType == ForwardTypeCourse && imginfo.ForwardResourceId == "" {
+>>>>>>> 25b458f1a666b753f4338f1649fcaeaa37b61fd4
 		return nil, errors.New("跳转资源不允许为空！")
 	}
 

service/message/location.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"errors"
+	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strings"
@@ -86,3 +87,45 @@ func (s *MessageServ) UpdateLocationSort(locations string) error {
 	}
 	return nil
 }
+
+// GetLocationInfoList 获取详情
+func (s *MessageServ) GetLocationInfoList() ([]message.LocationInfo, error) {
+	var org = s.ctx.Get("org").(model.SysOrg)
+	locations, err := s.dao.GetLocationInfoList(org.OrgId)
+	if err != nil {
+		utils.LogError("获取Location失败: " + err.Error())
+		return nil, errors.New("获取失败")
+	}
+	for inx, l := range locations {
+		news, err := s.dao.GetNewsByLocation(l.LocationId, org.OrgId)
+		if err != nil {
+			utils.LogError("获取新闻信息失败: " + err.Error())
+			return nil, errors.New("获取新闻信息失败")
+		}
+		locations[inx].News = news
+
+		imgs, err := s.dao.GetImgByLocation(l.LocationId, org.OrgId)
+		if err != nil {
+			utils.LogError("获取图片信息失败: " + err.Error())
+			return nil, errors.New("获取图片信息失败")
+		}
+		locations[inx].Banners = imgs
+		if l.LocationId == "selected" {
+			courses, err := s.coursedao.GetSelectCourseWithCaseList(org.OrgId)
+			if err != nil {
+				utils.LogError("获取课程信息失败: " + err.Error())
+				return nil, errors.New("获取课程信息失败")
+			}
+			locations[inx].Courses = courses
+		} else {
+			courses, err := s.coursedao.GetCourseWithCaseByLocation(org.OrgId, l.LocationId)
+			if err != nil {
+				utils.LogError("获取课程信息失败: " + err.Error())
+				return nil, errors.New("获取课程信息失败")
+			}
+			locations[inx].Courses = courses
+		}
+	}
+
+	return locations, nil
+}

service/sys.go

@@ -76,7 +76,7 @@ func (s *SysServ) AuthAndInitCtx(gctx *context.Context) map[string]interface{} {
 
 // NewToken 设置 TOKEN
 // 15 分钟后过期
-func (s *SysServ) NewToken() string {
+func (s *SysServ) NewToken(batch string) string {
 	var token *utils.JWTToken
 	exp := time.Now().Local().Add(15 * time.Second)
 
@@ -84,17 +84,19 @@ func (s *SysServ) NewToken() string {
 		userMap := s.ctx.Get("userMap").(model.TaUserMapping)
 
 		token = &utils.JWTToken{
-			Guest:  false,
-			ID:     userMap.Openid,
-			Expire: exp,
+			Guest:   false,
+			ID:      userMap.Openid,
+			Expire:  exp,
+			BatchNo: batch,
 		}
 	} else if s.ctx.Get("user") != nil {
 		user := s.ctx.Get("user").(model.SysUser)
 
 		token = &utils.JWTToken{
-			Guest:  false,
-			ID:     user.UserId,
-			Expire: exp,
+			Guest:   false,
+			ID:      user.UserId,
+			Expire:  exp,
+			BatchNo: batch,
 		}
 	} else {
 		token = &utils.JWTToken{
@@ -111,7 +113,7 @@ func (s *SysServ) NewToken() string {
 
 	// 入库
 	if !token.Guest {
-		if err := models.InsertToken(tokenEncodeStr, token.ID); err != nil {
+		if err := models.InsertToken(tokenEncodeStr, token.ID, batch, exp); err != nil {
 			utils.LogError("入库 Token 失败: " + err.Error())
 			return tokenEncodeStr
 		}
@@ -384,6 +386,7 @@ func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
 		return nil, errors.New("超时 或者 Token 已过期")
 	}
 
+	s.ctx.Set("token-batch", tk.BatchNo)
 	return utils.MapToJWTToken(token), nil
 }
 

service/verify/verify.go

@@ -78,7 +78,11 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 		return nil, errors.New("获取课程列表失败")
 	}
 	if len(customerDetail) == 0 {
+<<<<<<< HEAD
 		return nil, errors.New("今日无可核销课程")
+=======
+		return nil, nil
+>>>>>>> 25b458f1a666b753f4338f1649fcaeaa37b61fd4
 	}
 	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)

utils/jwt.go

@@ -44,6 +44,7 @@ type JWTToken struct {
 	Guest    bool
 	ID       string
 	Password string
+	BatchNo  string
 	Expire   time.Time
 }
 
@@ -53,6 +54,7 @@ func (t *JWTToken) ToMap() map[string]interface{} {
 		"guest":    t.Guest,
 		"user":     t.ID,
 		"password": t.Password,
+		"batchno":  t.BatchNo,
 		"exp":      t.Expire.Format("2006-01-02 15:04:05"),
 	}
 }
@@ -73,6 +75,10 @@ func MapToJWTToken(data map[string]interface{}) *JWTToken {
 		token.Password = data["password"].(string)
 	}
 
+	if data["batchno"] != nil {
+		token.BatchNo = data["batchno"].(string)
+	}
+
 	if data["exp"] != nil {
 		exp, _ := time.Parse("2006-01-02 15:04:05", data["exp"].(string))
 		token.Expire = exp