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

controllers/cases/signin.go

@@ -42,3 +42,25 @@ func (c *SigninController) GetSigninWhere() {
 
 	c.ResponseJSON(res)
 }
+
+// AddSignin 存入签到记录
+func (c *SigninController) AddSignin() {
+	phone := c.GetString("phone");
+	openId := c.GetString("openId")
+	caseId := c.GetString("caseId")
+	activityId := c.GetString("activityId")
+
+	signin := model.TaCheckinRecord{}
+	signin.Phone = phone
+	signin.OpenId = openId
+
+	userMapping := c.Context.Get("userMap").(model.TaUserMapping)
+
+	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMapping)
+
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(res)
+}
+

controllers/marketing/marketing.go

@@ -23,7 +23,7 @@ func (c *MarketingController) Constructor() {
 // 获取 营销活动列表
 func (c *MarketingController) GetMarketingList(){
 	page, _ := c.GetInt("page")
-	pageSize, _ := c.GetInt("pagesize")
+	pageSize, _ := c.GetInt("pageSize")
 
 	marketings, err := c.serv.GetMarketingList(page,pageSize)
 	if err != nil {
@@ -36,17 +36,19 @@ func (c *MarketingController) GetMarketingList(){
 // SaveMarketing 保存营销活动
 func (c *MarketingController) SaveMarketing() {
 	marketing := model.SysActivity{}
-
+	// 机构
+	//org := c.Context.Get("org").([]model.SysOrg)
 	// 获取值
 	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)
+	newInfo,_, err := c.serv.SaveMarketing(marketing,resourceDesc,caseId)
 	if err != nil {
 		c.ResponseError(err)
 	}
@@ -88,7 +90,7 @@ func (c *MarketingController) UpdateMarketing(){
 
 // DelMarketing 删除
 func (c *MarketingController) DelMarketing(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketing(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -98,7 +100,7 @@ func (c *MarketingController) DelMarketing(){
 
 // DelMarketing 正常
 func (c *MarketingController) DelMarketingNormal(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingNormal(activityId)
 	if err != nil {
 		c.ResponseError(err)
@@ -108,7 +110,7 @@ func (c *MarketingController) DelMarketingNormal(){
 
 // DelMarketing 停用
 func (c *MarketingController) DelMarketingDisable(){
-	activityId := c.GetString("activityId")
+	activityId := c.GetString(":activityId")
 	err := c.serv.DelMarketingDisable(activityId)
 	if err != nil {
 		c.ResponseError(err)

models/cases/signin.go

@@ -3,9 +3,10 @@ package cases
 import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
+	"spaceofcheng/services/models"
 	"strconv"
 	"strings"
-
+	"time"
 	"github.com/go-xorm/xorm"
 )
 
@@ -43,10 +44,10 @@ func NewSigninDAO(ctx *utils.Context) *SigninDAO {
 	}
 }
 
-// CaseInfo 案场
+// SigninInfo 案场
 type SigninInfo struct {
 	model.TaCheckinRecord `xorm:"extends"`
-	//CreateUserName string
+	UserId string
 }
 
 /**
@@ -95,3 +96,12 @@ func (m *SigninDAO) GetSigninWhere(selectType int, caseid string, page, pageSize
 	// }
 	return signin, err
 }
+
+// AddSignin 添加签到记录 
+func (m *SigninDAO) AddSignin(signin model.TaCheckinRecord)(model.TaCheckinRecord,error){
+	signin.CheckinId = utils.GetGUID()
+	signin.CreateDate = time.Now()
+	signin.Status = models.STATUS_NORMAL
+	_,err := m.db.Insert(signin)
+	return signin,err
+}

models/marketing/marketing.go

@@ -10,7 +10,7 @@ import(
 
 // 活动类型
 const (
-	NEW_ACTIVITIES = 0 // 注册赠券
+	NEW_ACTIVITIES = 1 // 注册赠券
 
 )
 
@@ -19,7 +19,6 @@ const (
 	DELETE = -1 // 删除
 	NORMAL = 0 // 正常
 	DISABLE = 1 // 停用
-
 )
 
 // 赠券卡券
@@ -43,9 +42,14 @@ 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
 }
 
@@ -53,7 +57,9 @@ type MarketingInfo struct {
 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 * 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)
+
 	err := m.db.Sql(sql).Find(&news)
 	return news, err
 
@@ -72,24 +78,18 @@ func (m *MarketingDAO) GetMarketingCount()(int64, error){
 
 
 // AddMarketing 添加
-func (m *MarketingDAO) AddMarketing(activity *model.SysActivity) (*model.SysActivity, error) {
+func (m *MarketingDAO) AddMarketing(activity model.SysActivity, caseId string) (*model.SysActivity, error) {
 	activity.ActivityId = utils.GetGUID()
 	activity.CreateDate = time.Now()
 	//activity.Status = models.STATUS_NORMAL
 	activity.Status = NORMAL // 状态为正常
 	org := m.ctx.Get("org").(model.SysOrg)
 	activity.OrgId = org.OrgId
-	caseinfo := m.ctx.Get("currentCase").(model.SysCase)
-	activity.CaseId = caseinfo.CaseId
-	//activity.CaseId = user.
+	activity.CaseId = caseId
 
-	_, err := m.db.Insert(activity)
+	_, err := m.db.Insert(&activity)
 
-	// // 添加活动动作数据
-	// var new model.SysActivityAction
-	// new.ActionId = activity.ActivityId
-	// new.ActiveType = activity.ActivityType
-	return activity, err
+	return &activity, err
 }
 
 

models/marketing/work.go

@@ -27,11 +27,12 @@ type WrokInfo struct {
 }
 
 // 添加 活动动作
-func (m *WorkDAO) AddWork(action *model.SysActivityAction) (*model.SysActivityAction,error){
+func (m *WorkDAO) AddWork(action model.SysActivityAction) (*model.SysActivityAction,error){
 	action.ActionId = utils.GetGUID()
+	println("service: 主键:" + action.ActionId + "活动ID"+action.ActivityId+" 活动类型-"+action.ActiveType+" 资源描述-"+action.ResourceDesc+" 资源类型-"+	action.ResourceType)
 	_,err := m.db.Insert(&action)
 
-	return action,err
+	return &action,err
 
 }
 

models/model/sys_activity.go

@@ -1,15 +1,15 @@
-package model
-
-import (
-	"time"
-)
-
-type SysActivity struct {
-	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
-	ActivityName string    `xorm:"VARCHAR(50)"`
-	ActivityType string    `xorm:"VARCHAR(64)"`
-	OrgId        string    `xorm:"VARCHAR(64)"`
-	CaseId       string    `xorm:"VARCHAR(64)"`
-	Status       int       `xorm:"SMALLINT(6)"`
-	CreateDate   time.Time `xorm:"DATETIME"`
-}
+package model
+
+import (
+	"time"
+)
+
+type SysActivity struct {
+	ActivityId   string    `xorm:"not null pk VARCHAR(64)"`
+	ActivityName string    `xorm:"VARCHAR(50)"`
+	ActivityType string    `xorm:"VARCHAR(64)"`
+	OrgId        string    `xorm:"VARCHAR(64)"`
+	CaseId       string    `xorm:"VARCHAR(64)"`
+	Status       int       `xorm:"SMALLINT(6)"`
+	CreateDate   time.Time `xorm:"DATETIME"`
+}

service/cases/signin.go

@@ -2,15 +2,19 @@ package cases
 
 import (
 	"spaceofcheng/services/models/cases"
+	"spaceofcheng/services/models/marketing"
 	"spaceofcheng/services/utils"
-
+	"spaceofcheng/services/models/model"
 	"github.com/astaxie/beego"
+	"encoding/json"
 )
 
 // SigninServ 系统处理
 type SigninServ struct {
 	ctx *utils.Context
 	dao *cases.SigninDAO
+	marDao  *marketing.MarketingDAO
+	caseDao     *cases.CaseDAO
 }
 
 // NewSigninServ 初始化
@@ -18,6 +22,8 @@ func NewSigninServ(ctx *utils.Context) *SigninServ {
 	return &SigninServ{
 		ctx: ctx,
 		dao: cases.NewSigninDAO(ctx),
+		marDao: marketing.NewMarketingDAO(ctx),
+		caseDao: cases.NewCaseDAO(ctx),
 	}
 }
 
@@ -47,3 +53,58 @@ func (s *SigninServ) GetSigninWhere(selectType int, caseids string, page, pageSi
 		"page":     page,
 	}, err
 }
+
+// 添加 签到记录
+func (s *SigninServ) AddSignin(signin model.TaCheckinRecord,caseId string,activityId string,userMap *model.TaUserMapping) (*model.TaCheckinRecord,error) {
+	if signin.OpenId == "" {
+		return nil, utils.LogError("没有OpenId")
+	}
+	if signin.Phone == "" {
+		return nil, utils.LogError("没有Phone手机号")
+	}
+	if caseId == "" {
+		return nil,utils.LogError("没有案场ID")
+	}
+	if activityId == ""  {
+		return nil,utils.LogError("没有活动ID")
+	}
+
+	// 获取上下文的用户
+	user := s.ctx.Get("user").(model.SysUser)
+	casesInfo,err := s.caseDao.GetCaseByID(caseId)
+	activityInfo,err := s.marDao.GetMarketingById(activityId)
+	
+	// 定义Map
+	var jsonMap = map[string]string{}
+	accountInfo := userMap.AccountInfo
+	// 转换JSON
+	var jsonBlob = []byte(accountInfo)
+	jsonErr := json.Unmarshal(jsonBlob, &jsonMap)
+
+	if jsonErr != nil {
+		return nil,utils.LogError("accountInfo转换json失败")
+	}
+	// openId
+	signin.OpenId = jsonMap["openid"]
+	// 微信昵称
+	signin.CustomerName = jsonMap["nickname"]
+	// 客户姓名
+	signin.Name = user.UserName
+	// 客户ID
+	signin.CustomerId = user.UserId
+
+	// 案场
+	signin.CaseId = casesInfo.CaseId
+	signin.CaseName = casesInfo.CaseName
+
+	// 活动
+	signin.ActivityId = activityInfo.ActivityId
+	signin.ActivityName = activityInfo.ActivityName
+
+	info, err := s.dao.AddSignin(signin)
+	if err != nil {
+		return nil,err
+	}
+
+	return &info,err
+}

service/marketing/marketing.go

@@ -21,10 +21,11 @@ func NewMarketingServ(ctx *utils.Context) *MarketingServ {
 	return &MarketingServ{
 		ctx: ctx,
 		dao: marketing.NewMarketingDAO(ctx),
+		wdao: marketing.NewWorkDAO(ctx),
 	}
 }
 
-// GetCustWithWXList 获取客户列表
+// GetMarketingList 获取活动列表
 func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]interface{}, error) {
 
 	if pageSize == 0 {
@@ -54,14 +55,14 @@ func (s *MarketingServ) GetMarketingList(page int, pageSize int) (map[string]int
 /**
 * resource_desc 活动描述
  */
-func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string) (*model.SysActivity, *model.SysActivityAction, error) {
+func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc string, caseId string) (*model.SysActivity, *model.SysActivityAction, error) {
 
 	var newInfo *model.SysActivity
 	var newWoke *model.SysActivityAction
 
 	var err error
 	// 存储 营销活动
-	newInfo, err = s.dao.AddMarketing(&activity)
+	newInfo, err = s.dao.AddMarketing(activity,caseId)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -70,9 +71,10 @@ func (s *MarketingServ) SaveMarketing(activity model.SysActivity, resourceDesc s
 	woke.ActivityId = newInfo.ActivityId
 	woke.ActiveType = newInfo.ActivityType
 	woke.ResourceDesc = resourceDesc
+	woke.ResourceType = "占位符"
 
 	// 存储 活动动作
-	newWoke, err = s.wdao.AddWork(&woke)
+	newWoke, err = s.wdao.AddWork(woke)
 	if err != nil {
 		return nil, nil, err
 	}

service/marketing/work.go

@@ -24,8 +24,7 @@ func NewWorkServ(ctx *utils.Context) *WorkServ {
 }
 
 // 保存 Work
-func (s *WorkServ) SaveWork(work *model.SysActivityAction)  (*model.SysActivityAction, error){
-		var newInfo *model.SysActivityAction
+func (s *WorkServ) SaveWork(work model.SysActivityAction)  (*model.SysActivityAction, error){
 		if work.ActivityId == "" {
 			return nil, utils.LogError("营销编号为空!")
 		}