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

controllers/cases/equipment.go

@@ -4,12 +4,14 @@ import "spaceofcheng/services/models/model"
 
 // GetEquipmentList 获取体检设备列表
 func (c *CaseController) GetEquipmentList() {
-	cases := c.Context.Get("cases").([]model.SysUserCase)
-	caseIDs := c.GetCaseIDs(cases)
+	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")
-
-	list, err := c.dao.GetCaseEquipment(caseIDs, page, pageSize)
+	list, err := c.dao.GetCaseEquipment(caseids, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/cases/key.go

@@ -48,6 +48,19 @@ func (c *CaseController) UnLockKey() {
 	c.ResponseJSON("解锁成功！")
 }
 
+// LockKey 绑定钥匙
+func (c *CaseController) LockKey() {
+	keyId := c.GetString(":keyid")
+	customerid := c.GetString(":customerid")
+	customername := c.GetString(":customername")
+	err := c.dao.LockKey(keyId, customerid, customername)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON("绑定成功！")
+
+}
+
 // DelKey 删除
 func (c *CaseController) DelKey() {
 	keyid := c.GetString(":keyid")

controllers/cases/signin.go

@@ -4,6 +4,8 @@ import (
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/service/cases"
+	"spaceofcheng/services/utils"
+	"errors"
 )
 
 // CaseController 信息
@@ -72,3 +74,64 @@ func (c *SigninController) AddSignin() {
 	c.ResponseJSON(res)
 }
 
+// GetSigninExcel 导出签到记录表
+func (c *SigninController) GetSigninExcel(){
+
+	selectType, err := c.GetInt("selectType")
+
+	// 案场
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
+	
+	// 查询出数据
+	list,err := c.dao.GetSigninExcel(selectType,caseids)
+	if err != nil {
+		c.ResponseError(err)
+	}
+
+	excel, err := utils.NewTinyXLSXEngine()
+	if err != nil {
+		utils.LogError("初始化Excel服务失败: " + err.Error())
+		c.ResponseError(errors.New("初始化Excel服务失败"))
+	}
+
+	// 创建表头
+	excel.SetCell(excel.InsertRow(), []string{
+		"案场",
+		"签到时间",
+		"微信昵称",
+		"客户姓名",
+		"客户类型",
+		"手机号",
+	})
+
+	// 遍历数据
+	for _, item := range list {
+		row := excel.InsertRow()
+	
+		userTypeName := ""
+		if item.UserId == "" {
+			userTypeName = "前台用户"
+		}else {
+			userTypeName = "后台用户"
+		}
+
+		 dateToString := item.CreateDate.Format("2006-01-02 15:04:05")
+
+		excel.SetCell(row, []string{
+			item.CaseName,
+			dateToString,
+			item.CustomerName,
+			item.Name,
+			userTypeName,
+			item.Phone,
+		})
+	}
+	c.SaveToExcel("签到记录列表.xlsx", excel)
+
+}
+
+

controllers/course/course.go

@@ -30,7 +30,8 @@ func (c *CourseController) GetCourseList() {
 	pageSize, _ := c.GetInt("pagesize")
 	name := c.GetString("name")
 	typeid := c.GetString("typeid")
-	courses, err := c.serv.GetCourseList(caseids, name, typeid, page, pageSize)
+	status := c.GetString("status")
+	courses, err := c.serv.GetCourseList(caseids, name, typeid, status, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/luckdrawlist/luckdrawlist.go

@@ -70,24 +70,31 @@ func (c *LuckdrawlistController) GetLuckShareList() {
 
 func (c *LuckdrawlistController) GetVerifyList() {
 	luckdrawId := c.GetString(":luckdrawId")
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
 	if luckdrawId == "" {
 		c.ResponseError(errors.New("无效二维码"))
 	}
-	luckdraw, err := c.dao.GetVerifyList(luckdrawId)
+	luckdraw, err := c.dao.GetVerifyList(luckdrawId, caseids)
 	if err != nil {
 		c.ResponseError(err)
 	}
+	if luckdraw == nil {
+		c.ResponseError(errors.New("您没有可以核销的奖品"))
+	}
 	c.ResponseJSON(luckdraw)
 }
 
 func (c *LuckdrawlistController) VerifyLuckdraw() {
 	sysUser := c.Context.Get("user").(model.SysUser)
 	userId := sysUser.UserId
+	cases := c.Context.Get("cases").([]model.SysUserCase)
+	caseids := c.GetCaseIDs(cases)
 	luckdrawId := c.GetString(":luckdrawId")
 	if luckdrawId == "" {
 		c.ResponseError(errors.New("无效二维码"))
 	}
-	err := c.dao.VerifyLuckdraw(luckdrawId, userId)
+	err := c.dao.VerifyLuckdraw(luckdrawId, caseids, userId)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/marketing/marketing.go

@@ -1,12 +1,11 @@
 package marketing
 
-import(
+import (
 	"spaceofcheng/services/controllers"
-	"spaceofcheng/services/service/marketing"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/service/marketing"
 )
 
-
 // CourseController 商品
 type MarketingController struct {
 	serv *marketing.MarketingServ
@@ -21,11 +20,11 @@ func (c *MarketingController) Constructor() {
 }
 
 // 获取 营销活动列表
-func (c *MarketingController) GetMarketingList(){
+func (c *MarketingController) GetMarketingList() {
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pageSize")
 
-	marketings, err := c.serv.GetMarketingList(page,pageSize)
+	marketings, err := c.serv.GetMarketingList(page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -42,13 +41,12 @@ func (c *MarketingController) SaveMarketing() {
 	activityName := c.GetString("activityName")
 	activityType := c.GetString("activityType")
 	resourceDesc := c.GetString("resourceDesc") // 活动描述
-	caseId := c.GetString("CaseId")
 
 	// 赋值
 	marketing.ActivityName = activityName
 	marketing.ActivityType = activityType
 
-	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc,caseId)
+	newInfo, _, err := c.serv.SaveMarketing(marketing, resourceDesc)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -56,13 +54,12 @@ func (c *MarketingController) SaveMarketing() {
 	c.ResponseJSON(newInfo)
 }
 
-
 // GetMarketingById 根据activityId查询
-func (c *MarketingController) GetMarketingById(){
-	 activityId := c.GetString("activityId")
+func (c *MarketingController) GetMarketingById() {
+	activityId := c.GetString("activityId")
 
-	 info,err :=	c.serv.GetMarketingById(activityId)
-	 if err != nil {
+	info, err := c.serv.GetMarketingById(activityId)
+	if err != nil {
 		c.ResponseError(err)
 	}
 
@@ -70,17 +67,17 @@ func (c *MarketingController) GetMarketingById(){
 }
 
 // UpdateMarketing 修改数据
-func (c *MarketingController) UpdateMarketing(){
+func (c *MarketingController) UpdateMarketing() {
 	activity := model.SysActivity{}
 
 	// 获取值
 	activityName := c.GetString("activityName")
 	activityType := c.GetString("activityType")
-	
+
 	// 赋值
 	activity.ActivityName = activityName
 	activity.ActivityType = activityType
-	
+
 	err := c.serv.UpdateMarketing(activity)
 	if err != nil {
 		c.ResponseError(err)
@@ -89,7 +86,7 @@ func (c *MarketingController) UpdateMarketing(){
 }
 
 // DelMarketing 删除
-func (c *MarketingController) DelMarketing(){
+func (c *MarketingController) DelMarketing() {
 	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketing(activityId)
 	if err != nil {
@@ -99,7 +96,7 @@ func (c *MarketingController) DelMarketing(){
 }
 
 // DelMarketing 正常
-func (c *MarketingController) DelMarketingNormal(){
+func (c *MarketingController) DelMarketingNormal() {
 	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingNormal(activityId)
 	if err != nil {
@@ -109,7 +106,7 @@ func (c *MarketingController) DelMarketingNormal(){
 }
 
 // DelMarketing 停用
-func (c *MarketingController) DelMarketingDisable(){
+func (c *MarketingController) DelMarketingDisable() {
 	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingDisable(activityId)
 	if err != nil {
@@ -117,10 +114,3 @@ func (c *MarketingController) DelMarketingDisable(){
 	}
 	c.ResponseJSON("操作成功!")
 }
-
-
-
-
-
-
-

models/card/card.go

@@ -320,13 +320,17 @@ func (m *CardDAO) GetCardWithCustomer(cardid string) (*CaseUsableCard, error) {
 // CustomerCardWithShare 我的卡券关联分享信息
 type CustomerCardWithShare struct {
 	model.TaCouponCard `xorm:"extends"`
+	CustomerCardId     string
+	CourseNum          int
+	JoinNum            int
+	CourseName         string
 	Share              *model.TaExperienceCardShare
 }
 
 // GetCardByCustomer 获取我的体验卡
 func (m *CardDAO) GetCardByCustomer(orgid, customerid string) ([]CustomerCardWithShare, error) {
 	var cards []CustomerCardWithShare
-	sql := `select * from ta_customer_card where status>? and customer_id=? and org_id=?`
+	sql := `select a.*,b.customer_course_id,b.course_num,b.join_num,b.course_name from ta_customer_card a left join ta_customer_course b on a.customer_card_id = b.source_id where a.status>? and a.customer_id=? and a.org_id=?`
 	err := m.db.Sql(sql, models.STATUS_DEL, customerid, orgid).Find(&cards)
 	if err != nil {
 		return nil, err

models/cases/cases.go

@@ -74,7 +74,7 @@ func (m *CaseDAO) GetCaseByID(caseid string) (*model.SysCase, error) {
 func (m *CaseDAO) AddCase(caseinfo model.SysCase) (*model.SysCase, error) {
 	caseinfo.CaseId = utils.GetGUID()
 	caseinfo.CreateDate = time.Now()
-	caseinfo.Status = models.STATUS_NORMAL
+	// caseinfo.Status = models.STATUS_NORMAL
 	user := m.ctx.Get("user").(model.SysUser)
 	caseinfo.CreateUser = user.UserId
 	_, err := m.db.Insert(caseinfo)
@@ -90,6 +90,7 @@ func (m *CaseDAO) UpdateCase(caseinfo model.SysCase) error {
 		"case_address",
 		"case_tel",
 		"coordinate",
+		"status",
 	}
 	_, err := m.db.Cols(cols...).Where("case_id=?", caseinfo.CaseId).Update(caseinfo)
 	return err

models/cases/key.go

@@ -7,6 +7,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 const (
@@ -107,11 +109,25 @@ func (m *CaseDAO) DelKey(keyid string) error {
 
 // UnLockKey 解绑钥匙信息
 func (m *CaseDAO) UnLockKey(keyid string) error {
-	sql := `update ta_case_key_use set status=` + strconv.Itoa(STATUS_UNLOCK) + ` where key_id= '` + keyid + `'`
+	sql := `update ta_case_key_use set status=` + strconv.Itoa(STATUS_UNLOCK) + `, return_date =NOW() where key_id= '` + keyid + `'`
+	beego.Error(sql)
 	_, err := m.db.Exec(sql)
 	return err
 }
 
+// BindKeyToUser 绑定钥匙信息
+func (m *CaseDAO) BindKeyToUser(keyid, customerId, customerName string) error {
+	var bindKey = model.TaCaseKeyUse{}
+	bindKey.UseId = utils.GetGUID()
+	bindKey.UseDate = time.Now()
+	bindKey.Status = models.STATUS_NORMAL
+	bindKey.KeyId = keyid
+	bindKey.CustomerName = customerName
+	bindKey.CustomerId = customerId
+	_, err := m.db.Insert(bindKey)
+	return err
+}
+
 // GetKeyByNumRange 根据区间获取钥匙
 func (m *CaseDAO) GetKeyByNumRange(caseid, nums string) ([]model.TaCaseKey, error) {
 	var keys []model.TaCaseKey

models/cases/signin.go

@@ -105,3 +105,46 @@ func (m *SigninDAO) AddSignin(signin model.TaCheckinRecord)(model.TaCheckinRecor
 	_,err := m.db.Insert(signin)
 	return signin,err
 }
+
+
+
+/**
+	 GetSigninExcel 根据条件查询签到记录
+			 条件:
+					 selectType: 今天,本周,本月,今年,全部
+					 caseid: 案场ID
+
+		ALL 				= -1 // 全部
+		TODAY 			= 0 // 今天
+		THIS_WEEK 	= 1 // 本周
+		THIS_MONTH 	= 2 // 本月
+		THIS_YEAR  	= 3 // 今年
+
+
+ **/
+ func (m *SigninDAO) GetSigninExcel(selectType int, caseid string) ([]SigninInfo, error) {
+	var signin []SigninInfo
+	var sql string
+	switch selectType {
+	case ALL:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC`
+	case TODAY:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC`
+	case THIS_WEEK:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE YEARWEEK(date_format(tcr.create_date,'%Y-%m-%d')) = YEARWEEK(now())  and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC`
+	case THIS_MONTH:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE DATE_FORMAT(tcr.create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC`
+	case THIS_YEAR:
+		sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where YEAR(tcr.create_date)=YEAR(NOW()) and tcr.case_id in ('` +
+			strings.Replace(caseid, ",", "','", -1) + `') ORDER BY tcr.create_date DESC`
+	}
+
+	err := m.db.Sql(sql).Find(&signin)
+	return signin, err
+}
+
+

models/cases/table.go

@@ -1,96 +1,96 @@
-package cases
-
-import (
-	"spaceofcheng/services/models"
-	"spaceofcheng/services/models/model"
-	"spaceofcheng/services/utils"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// GetCaseTableCount 获取桌位总数
-func (m *CaseDAO) GetCaseTableCount(caseids string) (int, error) {
-	var tables []model.SysCaseTable
-	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
-	err := dao.Find(&tables)
-	return len(tables), err
-}
-
-// CaseTableInfo 案场桌位
-type CaseTableInfo struct {
-	model.SysCaseTable `xorm:"extends"`
-	AreaName           string
-	CaseName           string
-}
-
-// GetCaseTable 根据案场获取桌位
-func (m *CaseDAO) GetCaseTable(caseids string, page int, pageSize int) ([]CaseTableInfo, error) {
-	var tables []CaseTableInfo
-	sql := `select a.*,b.area_name,c.case_name from sys_case_table a 
-	inner join sys_case_area b on a.area_id=b.area_id
-	inner join sys_case c on a.case_id=c.case_id
-	where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and b.status>` + strconv.Itoa(models.STATUS_DEL) +
-		` and c.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` +
-		strings.Replace(caseids, ",", "','", -1) + `')`
-
-	err := m.db.Sql(sql).Find(&tables)
-	return tables, err
-}
-
-// GetCaseTableByAreaID 根据区域ID获取桌位信息
-func (m *CaseDAO) GetCaseTableByAreaID(areaid string) ([]model.SysCaseTable, error) {
-	var tables []model.SysCaseTable
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", areaid).Find(&tables)
-	return tables, err
-}
-
-// GetCaseTableByID 根据ID获取桌位
-func (m *CaseDAO) GetCaseTableByID(tableid string) (*model.SysCaseTable, error) {
-	var tables []model.SysCaseTable
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("table_id=?", tableid).Find(&tables)
-	if err != nil {
-		return nil, err
-	}
-	if len(tables) > 0 {
-		return &tables[0], nil
-	}
-	return nil, nil
-}
-
-// AddCaseTable 新增桌位
-func (m *CaseDAO) AddCaseTable(area *model.SysCaseTable) (*model.SysCaseTable, error) {
-	area.TableId = utils.GetGUID()
-	area.Status = models.STATUS_NORMAL
-	area.CreateDate = time.Now()
-	user := m.ctx.Get("user").(model.SysUser)
-	area.CreateUser = user.UserId
-	_, err := m.db.Insert(area)
-	return area, err
-}
-
-// UpdateCaseTable 修改桌位
-func (m *CaseDAO) UpdateCaseTable(area model.SysCaseTable) error {
-	var cols = []string{
-		"table_no",
-		"order",
-		"remark",
-		"case_id",
-		"area_id",
-	}
-	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
-	return err
-}
-
-// DelCaseTable 刪除桌位
-func (m *CaseDAO) DelCaseTable(tableid string) error {
-	var area = model.SysCaseTable{
-		TableId: tableid,
-		Status:  models.STATUS_DEL,
-	}
-	var cols = []string{
-		"status",
-	}
-	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
-	return err
-}
+package cases
+
+import (
+	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// GetCaseTableCount 获取桌位总数
+func (m *CaseDAO) GetCaseTableCount(caseids string) (int, error) {
+	var tables []model.SysCaseTable
+	dao := m.db.Where("status>" + strconv.Itoa(models.STATUS_DEL)).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+	err := dao.Find(&tables)
+	return len(tables), err
+}
+
+// CaseTableInfo 案场桌位
+type CaseTableInfo struct {
+	model.SysCaseTable `xorm:"extends"`
+	AreaName           string
+	CaseName           string
+}
+
+// GetCaseTable 根据案场获取桌位
+func (m *CaseDAO) GetCaseTable(caseids string, page int, pageSize int) ([]CaseTableInfo, error) {
+	var tables []CaseTableInfo
+	sql := `select a.*,b.area_name,c.case_name from sys_case_table a 
+	inner join sys_case_area b on a.area_id=b.area_id
+	inner join sys_case c on a.case_id=c.case_id
+	where a.status>` + strconv.Itoa(models.STATUS_DEL) + ` and b.status>` + strconv.Itoa(models.STATUS_DEL) +
+		` and c.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id in ('` +
+		strings.Replace(caseids, ",", "','", -1) + `') limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+
+	err := m.db.Sql(sql).Find(&tables)
+	return tables, err
+}
+
+// GetCaseTableByAreaID 根据区域ID获取桌位信息
+func (m *CaseDAO) GetCaseTableByAreaID(areaid string) ([]model.SysCaseTable, error) {
+	var tables []model.SysCaseTable
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("area_id=?", areaid).Find(&tables)
+	return tables, err
+}
+
+// GetCaseTableByID 根据ID获取桌位
+func (m *CaseDAO) GetCaseTableByID(tableid string) (*model.SysCaseTable, error) {
+	var tables []model.SysCaseTable
+	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("table_id=?", tableid).Find(&tables)
+	if err != nil {
+		return nil, err
+	}
+	if len(tables) > 0 {
+		return &tables[0], nil
+	}
+	return nil, nil
+}
+
+// AddCaseTable 新增桌位
+func (m *CaseDAO) AddCaseTable(area *model.SysCaseTable) (*model.SysCaseTable, error) {
+	area.TableId = utils.GetGUID()
+	area.Status = models.STATUS_NORMAL
+	area.CreateDate = time.Now()
+	user := m.ctx.Get("user").(model.SysUser)
+	area.CreateUser = user.UserId
+	_, err := m.db.Insert(area)
+	return area, err
+}
+
+// UpdateCaseTable 修改桌位
+func (m *CaseDAO) UpdateCaseTable(area model.SysCaseTable) error {
+	var cols = []string{
+		"table_no",
+		"order",
+		"remark",
+		"case_id",
+		"area_id",
+	}
+	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
+	return err
+}
+
+// DelCaseTable 刪除桌位
+func (m *CaseDAO) DelCaseTable(tableid string) error {
+	var area = model.SysCaseTable{
+		TableId: tableid,
+		Status:  models.STATUS_DEL,
+	}
+	var cols = []string{
+		"status",
+	}
+	_, err := m.db.Cols(cols...).Where("table_id=?", area.TableId).Update(area)
+	return err
+}

models/channel/channel.go

@@ -45,8 +45,8 @@ func (m *ChannelDAO) GetChannels(caseid string, page int, pageSize int) ([]Chann
 	select a.*,b.case_name 
 	from ta_channel a 
 	inner join sys_case b on a.case_id = b.case_id 
-	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and b.status> ` + strconv.Itoa(models.STATUS_DEL) + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
-	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page) + `, ` + strconv.Itoa(pageSize)
+	where a.case_id in('` + strings.Replace(caseid, ",", "','", -1) + `') and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	sql += ` order by a.create_date desc limit ` + strconv.Itoa(page-1) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&channels)
 	return channels, err
 }

models/course/course.go

@@ -42,10 +42,10 @@ type CourseInfo struct {
 }
 
 // GetCourseList 获取课程列表
-func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize int) ([]CourseInfo, error) {
+func (m *CourseDAO) GetCourseList(caseids, name, typeid, status 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)
+		strings.Replace(caseids, ",", "','", -1) + `')`
 
 	if name != "" {
 		sql += ` and a.course_name like '%` + name + `%'`
@@ -55,15 +55,24 @@ func (m *CourseDAO) GetCourseList(caseids, name, typeid string, page, pageSize i
 		sql += ` and a.location_id='` + typeid + `'`
 	}
 
+	if status != "" {
+		if status != "1" {
+			status = "0"
+		}
+		sql += ` and a.status=` + status
+	} else {
+		sql += ` and a.status>` + strconv.Itoa(models.STATUS_DEL)
+	}
+
 	sql += ` order by create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&courses)
 	return courses, err
 }
 
 // GetCourseCount 获取课程总数
-func (m *CourseDAO) GetCourseCount(caseids, name, typeid string) (int, error) {
+func (m *CourseDAO) GetCourseCount(caseids, name, typeid, status 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))
+	dao := m.db.Where("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
@@ -72,6 +81,16 @@ func (m *CourseDAO) GetCourseCount(caseids, name, typeid string) (int, error) {
 	if typeid != "" {
 		dao.And("location_id=?", typeid)
 	}
+
+	if status != "" {
+		if status != "1" {
+			status = "0"
+		}
+		dao.And("status=?", status)
+	} else {
+		dao.And("status>" + strconv.Itoa(models.STATUS_DEL))
+	}
+
 	err := dao.Find(&course)
 	if err != nil {
 		return 0, err
@@ -334,8 +353,9 @@ func (m *CourseDAO) AddCourseDetail(detail model.TaCourseDetail) (*model.TaCours
 func (m *CourseDAO) UpdateCourseDetail(detail model.TaCourseDetail) error {
 	var cols = []string{
 		"detail_name",
-		"begin_date",
-		"end_date",
+		"detail_desc",
+		// "begin_date",
+		// "end_date",
 	}
 	_, err := m.db.Cols(cols...).Where("detail_id=?", detail.DetailId).Update(detail)
 	return err
@@ -415,7 +435,10 @@ func (m *CourseDAO) DeleteScheduleByCourse(courseid string) error {
 // GetSelectCourseList 获取精选课程
 func (m *CourseDAO) GetSelectCourseList(orgid string) ([]CourseDetail, error) {
 	var courses []CourseDetail
-	sql := `select * from ta_course where is_select=` + strconv.Itoa(IS_SELECT) + ` and status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `'`
+	sql := `select * from ta_course where is_select=` + strconv.Itoa(IS_SELECT) + ` and status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `'
+	and 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
 }
@@ -423,7 +446,10 @@ func (m *CourseDAO) GetSelectCourseList(orgid string) ([]CourseDetail, error) {
 // GetCourseByLocation 根据位置获取课程信息
 func (m *CourseDAO) GetCourseByLocation(orgid, locationid string) ([]CourseDetail, error) {
 	var courses []CourseDetail
-	sql := `select * from ta_course where status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `' and location_id ='` + locationid + `'`
+	sql := `select * from ta_course where status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and org_id='` + orgid + `' and location_id ='` + locationid + `' 
+	and 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/goods/orders.go

@@ -248,16 +248,16 @@ func (m *GoodsDAO) GetCustomerOrdersCount(custID string) (int, error) {
 }
 
 // GetOrdersCountByCase 根据案场获取订单信息
-func (m *GoodsDAO) GetOrdersCountByCase(caseid string) (int64, error) {
+func (m *GoodsDAO) GetOrdersCountByCase(caseid, userid string) (int64, error) {
 	order := new(model.TaGoodsOrders)
-	total, err := m.db.Where("case_id = ?", caseid).And("status>"+strconv.Itoa(models.STATUS_DEL)).SumInt(order, "orders_num")
+	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("status>"+strconv.Itoa(models.STATUS_DEL)).SumInt(order, "orders_num")
 	return total, err
 }
 
 // GetMonthOrdersCountByCase 获取案场本月的订单数量
-func (m *GoodsDAO) GetMonthOrdersCountByCase(caseid string) (int64, error) {
+func (m *GoodsDAO) GetMonthOrdersCountByCase(caseid, userid string) (int64, error) {
 	order := new(model.TaGoodsOrders)
-	total, err := m.db.Where("case_id = ?", caseid).And("status>"+strconv.Itoa(models.STATUS_DEL)).And("date_format(create_date,'%Y-%m')=date_format(NOW(),'%Y-%m')").SumInt(order, "orders_num")
+	total, err := m.db.Where("case_id = ?", caseid).And("user_id=?", userid).And("status>"+strconv.Itoa(models.STATUS_DEL)).And("date_format(create_date,'%Y-%m')=date_format(NOW(),'%Y-%m')").SumInt(order, "orders_num")
 	return total, err
 }
 

models/luckdrawlist/luckdrawlist.go

@@ -84,7 +84,7 @@ func (m *LuckdrawDAO) GetLuckShareList(fromPhone, toPhone string, filters string
 	return luckShare, total, err
 }
 
-func (m *LuckdrawDAO) GetLuckdrawById(luckdrawId string) (*Luckdraw, error) {
+func (m *LuckdrawDAO) GetLuckdrawById(luckdrawId, caseids string) (*Luckdraw, error) {
 	var luckdraw []Luckdraw
 	sql := `SELECT
 	a.*,
@@ -102,7 +102,8 @@ FROM
 WHERE
 	 DATE_FORMAT( e.verification_start, '%Y-%m-%d' ) <= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
 	 AND DATE_FORMAT( e.verification_end, '%Y-%m-%d' ) >= DATE_FORMAT( NOW( ), '%Y-%m-%d' )
-	 AND a.id = '` + luckdrawId + `'`
+	 AND a.id = '` + luckdrawId + `'
+	 and b.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 	err := m.db.Sql(sql).Find(&luckdraw)
 	if err != nil {
 		return nil, err

models/marketing/marketing.go

@@ -1,10 +1,12 @@
 package marketing
 
-import(
+import (
+	"jcjy/demo/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
 	"time"
+
 	"github.com/go-xorm/xorm"
 )
 
@@ -14,17 +16,10 @@ const (
 
 )
 
-// 状态
-const (
-	DELETE = -1 // 删除
-	NORMAL = 0 // 正常
-	DISABLE = 1 // 停用
-)
-
 // 赠券卡券
 const (
-	drink = 1 // 饮品通用卷
-	course = 2 // 课程通用卷
+	drink          = 1 // 饮品通用卷
+	course         = 2 // 课程通用卷
 	petty_diplomat = 3 // 小小外交官通用卷
 )
 
@@ -42,23 +37,23 @@ func NewMarketingDAO(ctx *utils.Context) *MarketingDAO {
 	}
 }
 
-// MarketingInfo 
+// MarketingInfo
 type MarketingInfo struct {
 	model.SysActivity `xorm:"extends"`
-	CaseName		 string
-	ActionId     string
-	ActiveType  string
-	ResourceType string
-	ResourceDesc string
-	Actions []model.SysActivityAction
+	CaseName          string
+	ActionId          string
+	ActiveType        string
+	ResourceType      string
+	ResourceDesc      string
+	Actions           []model.SysActivityAction
 }
 
 // GetMarketingList 查询所有
-func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo ,error){
+func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo, error) {
 
 	var news []MarketingInfo
 	//sql := `select * from sys_activity new order by new.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
-	sql :=`SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
+	sql := `SELECT sc.case_name,sa.*,sas.action_id,sas.active_type,sas.resource_type,sas.resource_desc from sys_activity sa LEFT JOIN sys_activity_action sas on sa.activity_id = sas.activity_id LEFT JOIN sys_case sc on sa.case_id = sc.case_id where sa.status != -1 order by sa.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + ", " + strconv.Itoa(pageSize)
 
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
@@ -66,60 +61,53 @@ func (m *MarketingDAO) GetMarketingList(page int, pageSize int) ([]MarketingInfo
 }
 
 // GetMarketingCount 获取总数
-func (m *MarketingDAO) GetMarketingCount()(int64, error){
+func (m *MarketingDAO) GetMarketingCount() (int64, error) {
 	var total []int64
-	sql := `select count(*) as total from sys_activity`
+	sql := `select count(*) as total from sys_activity where status>` + strconv.Itoa(models.STATUS_DEL)
 	err := m.db.Sql(sql).Cols("total").Find(&total)
-	if err!=nil{
+	if err != nil {
 
 	}
 	return total[0], err
 }
 
-
 // AddMarketing 添加
-func (m *MarketingDAO) AddMarketing(activity model.SysActivity, caseId string) (*model.SysActivity, error) {
+func (m *MarketingDAO) AddMarketing(activity model.SysActivity) (*model.SysActivity, error) {
 	activity.ActivityId = utils.GetGUID()
 	activity.CreateDate = time.Now()
 	//activity.Status = models.STATUS_NORMAL
-	activity.Status = NORMAL // 状态为正常
+	activity.Status = models.STATUS_NORMAL // 状态为正常
 	org := m.ctx.Get("org").(model.SysOrg)
 	activity.OrgId = org.OrgId
-	activity.CaseId = caseId
-
 	_, err := m.db.Insert(&activity)
 
 	return &activity, err
 }
 
-
 // GetMarketingById 根据ID查询活动营销
-func (m *MarketingDAO) GetMarketingById(activityId string) (*model.SysActivity,error){
+func (m *MarketingDAO) GetMarketingById(activityId string) (*model.SysActivity, error) {
 
 	var activity []model.SysActivity
-	err := m.db.Where("activity_id=?",activityId).Find(&activity)
+	err := m.db.Where("activity_id=?", activityId).Find(&activity)
 	if err != nil {
 		return nil, err
 	}
-	if len(activity) >0 {
-		return &activity[0],nil
+	if len(activity) > 0 {
+		return &activity[0], nil
 	}
-	return nil,nil
-	
+	return nil, nil
+
 }
 
 // DelMarketing 修改状态 营销活动(删除,启用,停用)
 /**
- *	DELETE = -1 // 删除
-		NORMAL = 0 // 正常
-		DISABLE = 1 // 停用
  **/
-func (m *MarketingDAO) DelMarketing(activityId string,status int) error {
+func (m *MarketingDAO) DelMarketing(activityId string, status int) error {
 
 	var info = model.SysActivity{
 		ActivityId: activityId,
 		// Status:   models.STATUS_DEL,
-		Status:   status,
+		Status: status,
 	}
 	var cols = []string{
 		"status",
@@ -128,7 +116,6 @@ func (m *MarketingDAO) DelMarketing(activityId string,status int) error {
 	return err
 }
 
-
 // UpdateMarketing 修改 营销活动
 func (m *MarketingDAO) UpdateMarketing(activity model.SysActivity) error {
 	// var cols = []string{
@@ -146,8 +133,3 @@ func (m *MarketingDAO) UpdateMarketing(activity model.SysActivity) error {
 	_, err := m.db.Cols(cols...).Where("action_id=?", activity.ActivityId).Update(activity)
 	return err
 }
-
-
-
-
-

models/message/cmscase.go

@@ -122,6 +122,7 @@ func (m *MessageDAO) UpdateCmsCase(cmscase model.TaCmsCase) error {
 		"is_all_course",
 		"status",
 		"sort",
+		"case_id",
 	}
 	_, err := m.db.Cols(col...).Where("cms_case_id=?", cmscase.CmsCaseId).Update(cmscase)
 	return err

models/message/image.go

@@ -28,7 +28,7 @@ func (m *MessageDAO) GetImgListCount(orgid string) (int, error) {
 // GetImgByLocation 根据位置获取轮播图信息
 func (m *MessageDAO) GetImgByLocation(locationid, orgid string) ([]model.TaCmsImages, error) {
 	var imgs []model.TaCmsImages
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
+	err := m.db.Where("status="+strconv.Itoa(models.STATUS_NORMAL)).And("org_id=?", orgid).And("location_id=?", locationid).Asc("sort").Find(&imgs)
 	return imgs, err
 }
 

models/statistics/cardcoupon.go

@@ -225,7 +225,7 @@ func (m *StatisticsDAO) CardCouponUsedStatistics(caseids, tel, name, receivetype
 							a.end_date,
 							a.receive_date,
 							a.receive_date as used_date,
-							a.verify_status
+							'used' as verify_status
 						FROM
 							ta_customer_card a
 						INNER JOIN ta_coupon_card_target b ON b.card_id = a.card_id

models/system/user.go

@@ -231,7 +231,7 @@ func (m *UserDAO) DelUserMenu(userid string) error {
 
 // SaveUserMenu 保存用户对应的菜单信息
 func (m *UserDAO) SaveUserMenu(userid string) error {
-	sql := `insert into sys_user_menu(user_id,menu_id) select '` + userid + `', a.menu_id from sys_role_menu a inner join sys_user_role b on a.role_id = b.role_id inner join sys_menu c on c.menu_id = a.menu_id where b.user_id = '` + userid + `' and c.status>` + strconv.Itoa(models.STATUS_DEL)
+	sql := `insert into sys_user_menu(user_id,menu_id) select DISTINCT '` + userid + `', a.menu_id from sys_role_menu a inner join sys_user_role b on a.role_id = b.role_id inner join sys_menu c on c.menu_id = a.menu_id where b.user_id = '` + userid + `' and c.status>` + strconv.Itoa(models.STATUS_DEL)
 	_, err := m.db.Exec(sql)
 	return err
 }
@@ -282,12 +282,12 @@ func (m *UserDAO) SaveUserCase(usercase model.SysUserCase) error {
 // SaveUserCaseByUserTag 根据用户标签保存用户对应案场
 func (m *UserDAO) SaveUserCaseByUserTag(userid string) error {
 	sql := `insert into sys_user_case(user_id, case_id, case_name, is_belong, status, create_date) 
-	select c.user_id, a.case_id,a.case_name, 0,?,now() from sys_case a 
+	select DISTINCT c.user_id, a.case_id,a.case_name, 0,?,now() from sys_case a 
 	inner join sys_tag_case b on a.case_id = b.case_id
 	inner join sys_user_tag c on b.tag_id = c.tag_id
 	where c.user_id = ? and a.status > ` + strconv.Itoa(models.STATUS_DEL)
 
-	_, err := m.db.Exec(sql, userid, models.STATUS_DEL)
+	_, err := m.db.Exec(sql, models.STATUS_NORMAL, userid)
 	return err
 }
 
@@ -379,7 +379,7 @@ func (m *UserDAO) GetUserByName(userName string) (*model.SysUser, error) {
 func (m *UserDAO) GetUserByPhone(phone string) (*model.SysUser, error) {
 	user := model.SysUser{}
 
-	has, err := m.db.Where("phone=?", phone).Get(&user)
+	has, err := m.db.Where("phone=?", phone).And("status>?", models.STATUS_DEL).Get(&user)
 	if err != nil {
 		return nil, err
 	}
@@ -432,7 +432,7 @@ func (m *UserDAO) GetUserWithTypeByID(userID string) ([]UserWithType, error) {
 // CheckUserPhone 用户电话重复校验
 func (m *UserDAO) CheckUserPhone(userid, phone, orgid string) (bool, error) {
 	var users []model.SysUser
-	dao := m.db.Where("phone=?", phone).And("org_id=?", orgid)
+	dao := m.db.Where("phone=?", phone).And("org_id=?", orgid).And("status>?", models.STATUS_DEL)
 	if userid != "" {
 		dao.And("user_id <> '" + userid + "'")
 	}

models/verify/verify.go

@@ -28,6 +28,7 @@ type MyCourse struct {
 	CaseName                     string
 	DetailName                   string
 	LocationName                 string
+	CustomerId                   string
 }
 
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {

routers/common.go

@@ -138,6 +138,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// casekey 案场钥匙
 		beego.NSRouter("/case/key", &cases.CaseController{}, "get:GetKeyList"),
 		beego.NSRouter("/case/key", &cases.CaseController{}, "post:AddKeys"),
+		beego.NSRouter("/case/key/:keyid/:customerid/:customername", &cases.CaseController{}, "post:LockKey"),
 		beego.NSRouter("/case/unlock/:keyid", &cases.CaseController{}, "put:UnLockKey"),
 		beego.NSRouter("/case/key/:keyid", &cases.CaseController{}, "delete:DelKey"),
 
@@ -279,6 +280,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		// 签到
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "get:GetSigninWhere"),
 		beego.NSRouter("/case/signin", &cases.SigninController{}, "post:AddSignin"),
+		beego.NSRouter("/case/excelSignin", &cases.SigninController{}, "get:GetSigninExcel"),
 
 		// websocket
 		beego.NSRouter("/websocket/:grps/:id", &controllers.BaseController{}, "get:Ws"),

service/cases/key.go

@@ -90,6 +90,14 @@ func (s *CaseServ) UnLockKey(keyid string) error {
 	}
 	return nil
 }
+func (s *CaseServ) LockKey(keyId, customerId, customerName string) error {
+	err := s.dao.BindKeyToUser(keyId, customerId, customerName)
+	if err != nil {
+		utils.LogError("绑定钥匙失败: " + err.Error())
+		return errors.New("绑定钥匙失败")
+	}
+	return nil
+}
 
 // DelKey 刪除
 func (s *CaseServ) DelKey(keyid string) error {

service/cases/signin.go

@@ -112,3 +112,16 @@ func (s *SigninServ) AddSignin(signin model.TaCheckinRecord, caseId string, acti
 
 	return &info, err
 }
+
+// GetSigninExcel 根据条件查询出签到记录
+func (s *SigninServ) GetSigninExcel(selectType int, caseids string) ([]cases.SigninInfo, error) {
+
+	info,err := s.dao.GetSigninExcel(selectType,caseids)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
+
+	return info,err
+}
+

service/course/course.go

@@ -37,19 +37,19 @@ func NewCourseServ(ctx *utils.Context) *CourseServ {
 }
 
 // GetCourseList 获取课程列表
-func (s *CourseServ) GetCourseList(caseids, name, typeid string, page, pageSize int) (map[string]interface{}, error) {
+func (s *CourseServ) GetCourseList(caseids, name, typeid, status 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)
+	list, err := s.dao.GetCourseList(caseids, name, typeid, status, page, pageSize)
 	if err != nil {
 		utils.LogError("获取课程信息失败: " + err.Error())
 		return nil, errors.New("获取课程信息失败")
 	}
-	total, err := s.dao.GetCourseCount(caseids, name, typeid)
+	total, err := s.dao.GetCourseCount(caseids, name, status, typeid)
 	if err != nil {
 		utils.LogError("获取课程信息失败: " + err.Error())
 		return nil, errors.New("获取课程信息失败")

service/customer/customer.go

@@ -14,6 +14,8 @@ import (
 	"spaceofcheng/services/utils"
 	"strconv"
 	"time"
+
+	"github.com/astaxie/beego"
 )
 
 // CustomerServ 系统处理
@@ -130,7 +132,7 @@ func (s *CustomerServ) BindWechatUser(userMap *model.TaUserMapping, phone string
 
 		// 更新用户手机号码信息及userid信息
 		customer, err := s.dao.GetCustWithWXByOpenID(wxInfo.OpenID)
-
+		beego.Error(customer)
 		newCust := model.TaCustomer{
 			CustomerId: customer.CustomerId,
 			Phone:      user.Phone,

service/goods/orders.go

@@ -500,12 +500,16 @@ func (s *GoodsServ) GetCustomerOrders(page, pageSize int) (map[string]interface{
 
 // GetCaseOrdersNum 获取案场订单数量
 func (s *GoodsServ) GetCaseOrdersNum(caseid string) (map[string]interface{}, error) {
-	total, err := s.dao.GetOrdersCountByCase(caseid)
+	customer := s.ctx.Get("customer").(model.TaCustomer)
+	if customer.UserId == "" {
+		return nil, errors.New("您没有权限查看此数据！")
+	}
+	total, err := s.dao.GetOrdersCountByCase(caseid, customer.UserId)
 	if err != nil {
 		utils.LogError("获取案场订单数量失败: " + err.Error())
 		return nil, errors.New("获取案场信息失败")
 	}
-	monthtotal, err := s.dao.GetMonthOrdersCountByCase(caseid)
+	monthtotal, err := s.dao.GetMonthOrdersCountByCase(caseid, customer.UserId)
 	if err != nil {
 		utils.LogError("获取月案场订单数量失败: " + err.Error())
 		return nil, errors.New("获取案场信息失败")

service/luckdrawlist/luckdrawlist.go

@@ -95,8 +95,8 @@ func (s *LuckdrawlistServ) GetLuckdrawList(caseID string, pagenavi ...int) ([]lu
 
 }
 
-func (s *LuckdrawlistServ) GetVerifyList(luckdrawId string) (*luckdrawlist.Luckdraw, error) {
-	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId)
+func (s *LuckdrawlistServ) GetVerifyList(luckdrawId, caseIDs string) (*luckdrawlist.Luckdraw, error) {
+	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId, caseIDs)
 	if err != nil {
 		utils.LogError("查询抽奖列表失败: " + err.Error())
 		return nil, errors.New("查询抽奖列表失败")
@@ -105,8 +105,8 @@ func (s *LuckdrawlistServ) GetVerifyList(luckdrawId string) (*luckdrawlist.Luckd
 
 }
 
-func (s *LuckdrawlistServ) VerifyLuckdraw(luckdrawId, userId string) error {
-	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId)
+func (s *LuckdrawlistServ) VerifyLuckdraw(luckdrawId, caseIDs, userId string) error {
+	luckdraw, err := s.dao.GetLuckdrawById(luckdrawId, caseIDs)
 	err = s.dao.VerifyLuckdraw(luckdrawId)
 	if err != nil {
 		utils.LogError("核销失败: " + err.Error())

service/marketing/marketing.go

@@ -1,8 +1,10 @@
 package marketing
 
 import (
+	"jcjy/demo/models"
 	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/models/model"
+	"spaceofcheng/services/models/system"
 	"spaceofcheng/services/service"
 	"spaceofcheng/services/utils"
 
@@ -11,17 +13,19 @@ import (
 
 // MarketingServ 系统处理
 type MarketingServ struct {
-	ctx  *utils.Context
-	dao  *marketing.MarketingDAO
-	wdao *marketing.WorkDAO
+	ctx     *utils.Context
+	dao     *marketing.MarketingDAO
+	wdao    *marketing.WorkDAO
+	userdao *system.UserDAO
 }
 
 // NewMarketingServ 初始化
 func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 	return &MarketingServ{
-		ctx: ctx,
-		dao: marketing.NewMarketingDAO(ctx),
-		wdao: marketing.NewWorkDAO(ctx),
+		ctx:     ctx,
+		dao:     marketing.NewMarketingDAO(ctx),
+		wdao:    marketing.NewWorkDAO(ctx),
+		userdao: system.NewUserDAO(ctx),
 	}
 }
 
@@ -55,14 +59,20 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 /**
 * resource_desc 活动描述
  */
-func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string, caseId string) (*model.SysActivity, *model.SysActivityAction, error) {
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
 
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
-	var err error
+	user := s.ctx.Get("user").(model.SysUser)
+
+	caseinfo, err := s.userdao.GetUserBelongCase(user.UserId)
+	if err != nil {
+		return nil, nil, err
+	}
+	activity.CaseId = caseinfo.CaseId
 	// 存储 营销活动
-	newInfo, err = s.dao.AddMarketing(activity,caseId)
+	newInfo, err = s.dao.AddMarketing(activity)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -97,7 +107,7 @@ func (s *MarketingServ) GetMarketingById(activityId string) (*model.SysActivity,
 	if info == nil {
 		return nil, utils.LogError("不存在营销信息!")
 	}
-	if info.Status == marketing.DELETE {
+	if info.Status == models.STATUS_DEL {
 		return nil, utils.LogError("营销信息已被删除！")
 	}
 
@@ -117,10 +127,10 @@ func (s *MarketingServ) DelMarketing(activityId string) error {
 		return err
 	}
 	// 判断状态是否被删除
-	if info.Status == marketing.DELETE {
+	if info.Status == models.STATUS_DEL {
 		return utils.LogError("营销状态异常")
 	}
-	err = s.dao.DelMarketing(activityId, marketing.DELETE)
+	err = s.dao.DelMarketing(activityId, models.STATUS_DEL)
 	return err
 
 }
@@ -137,10 +147,10 @@ func (s *MarketingServ) DelMarketingNormal(activityId string) error {
 		return err
 	}
 	// 判断状态是否已经是正常
-	if info.Status == marketing.NORMAL {
+	if info.Status == models.STATUS_NORMAL {
 		return utils.LogError("营销状态异常")
 	}
-	err = s.dao.DelMarketing(activityId, marketing.NORMAL)
+	err = s.dao.DelMarketing(activityId, models.STATUS_NORMAL)
 	return err
 
 }
@@ -157,10 +167,10 @@ func (s *MarketingServ) DelMarketingDisable(activityId string) error {
 		return err
 	}
 	// 判断状态是否已经是停用
-	if info.Status == marketing.DISABLE {
+	if info.Status == models.STATUS_READY {
 		return utils.LogError("营销状态异常")
 	}
-	err = s.dao.DelMarketing(activityId, marketing.DISABLE)
+	err = s.dao.DelMarketing(activityId, models.STATUS_READY)
 	return err
 
 }

service/message/image.go

@@ -71,12 +71,18 @@ 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 == "" {
+>>>>>>> e764b3b931d583be9d2c311ab12132dd234f3ae0
 		return nil, errors.New("跳转资源不允许为空！")
 	}
 
 	if imginfo.ImageId == "" {
+		org := s.ctx.Get("org").(model.SysOrg)
+		imginfo.OrgId = org.OrgId
 		newinfo, err := s.dao.AddCmsImg(imginfo)
 		if err != nil {
 			utils.LogError("保存图片信息失败: " + err.Error())

service/user.go

@@ -74,18 +74,18 @@ func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 	user.Pwd = ""
 	// 当前用户案场
 	sessionCase := s.ctx.Get("cases").([]model.SysUserCase)
-	caseIDs := ""
-	for _, value := range sessionCase {
-		if caseIDs != "" {
-			caseIDs = caseIDs + ","
-		}
-		caseIDs = caseIDs + value.CaseId
-	}
-	cases, err := s.casedao.GetCaseByIDs(caseIDs)
-	if err != nil {
-		beego.Error(err)
-		return nil, err
-	}
+	// caseIDs := ""
+	// for _, value := range sessionCase {
+	// 	if caseIDs != "" {
+	// 		caseIDs = caseIDs + ","
+	// 	}
+	// 	caseIDs = caseIDs + value.CaseId
+	// }
+	// cases, err := s.casedao.GetCaseByIDs(caseIDs)
+	// if err != nil {
+	// 	beego.Error(err)
+	// 	return nil, err
+	// }
 	// 当前用户角色
 	roles, err := s.dao.GetUserRole(user.UserId)
 	if err != nil {
@@ -101,7 +101,7 @@ func (s *UserServ) GetCurrentEnvVars() (map[string]interface{}, error) {
 
 	rtn := map[string]interface{}{
 		"user":      user,
-		"cases":     cases,
+		"cases":     sessionCase,
 		"roles":     roles,
 		"menus":     menus,
 		"clienturl": beego.AppConfig.String("clienturl"),
@@ -173,6 +173,15 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 	var err error
 	var newUSer *model.SysUser
 
+	if user.UserName == "" {
+		return nil, errors.New("用户名不允许为空！")
+	}
+	if user.RealName == "" {
+		return nil, errors.New("用户真实姓名不允许为空！")
+	}
+	if user.Phone == "" {
+		return nil, errors.New("用户手机号不能为空！")
+	}
 	// 手机号码与用户名校验
 	var isok bool
 	isok, err = s.dao.CheckUserName(user.UserId, user.UserName, user.OrgId)
@@ -251,6 +260,13 @@ func (s *UserServ) SaveUser(user system.SysUserForm) (*model.SysUser, error) {
 		beego.Error(err)
 		return nil, err
 	}
+
+	// 保存用户标签案场信息
+	err = s.dao.SaveUserCaseByUserTag(newUSer.UserId)
+	if err != nil {
+		beego.Error(err)
+		return nil, err
+	}
 	newUSer.Pwd = ""
 
 	// 保存用户后判断用户是否在客户表中，如果存在，更新

service/verify/verify.go

@@ -74,22 +74,26 @@ func (s *VerifyServ) GetCustomerCourseDetailByTel(tel, caseids string, page, pag
 	}
 	customerDetail, err := s.dao.GetCustomerCourseListByTel(tel, caseids, page, pageSize)
 	if err != nil {
-		utils.LogError("获取列表失败: " + err.Error())
-		return nil, errors.New("获取列表失败")
+		utils.LogError("获取课程列表失败: " + err.Error())
+		return nil, errors.New("获取课程列表失败")
 	}
 	if len(customerDetail) == 0 {
-		return nil, errors.New("获取列表失败")
+<<<<<<< HEAD
+		return nil, errors.New("今日无可核销课程")
+=======
+		return nil, nil
+>>>>>>> e764b3b931d583be9d2c311ab12132dd234f3ae0
 	}
 	customerID := customerDetail[0].CustomerId
 	total, err := s.dao.GetCustomerCourseListByTelCount(tel, caseids)
 	if err != nil {
-		utils.LogError("获取列表失败: " + err.Error())
-		return nil, errors.New("获取列表失败")
+		utils.LogError("获取列表数量失败: " + err.Error())
+		return nil, errors.New("获取列表数量失败")
 	}
 	customer, err := s.cdao.GetCustomerByID(customerID)
 	if err != nil {
-		utils.LogError("获取列表失败: " + err.Error())
-		return nil, errors.New("获取列表失败")
+		utils.LogError("获取客户详情: " + err.Error())
+		return nil, errors.New("获取客户详情")
 	}
 	return map[string]interface{}{
 		"list":         customerDetail,