|
@@ -62,8 +62,8 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
}
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
- condition = " AND user_id = ? AND activity_id = ? "
|
|
|
- pars = append(pars, uid, activityId)
|
|
|
+ condition = " AND open_id = ? AND activity_id = ? "
|
|
|
+ pars = append(pars, user.OpenId, activityId)
|
|
|
total, err := models.GetCygxActivitySigninCount(condition, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
@@ -80,6 +80,7 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.IsSignup = totalMySuccess
|
|
|
item.CountryCode = user.CountryCode
|
|
|
+ item.OpenId = user.OpenId
|
|
|
item.CreateTime = time.Now()
|
|
|
if total == 0 && user.Mobile != "" {
|
|
|
err = models.AddCygxActivitySignin(item)
|
|
@@ -92,6 +93,9 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
|
|
|
//记录签到信息到用户到会表
|
|
|
if user.CompanyId > 1 {
|
|
|
+ pars = make([]interface{}, 0)
|
|
|
+ condition = " AND user_id = ? AND activity_id = ? "
|
|
|
+ pars = append(pars, user.UserId, activityId)
|
|
|
totalOfflineMeeting, err := models.GetCygxActivityOfflineMeetingDetailCount(condition, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
@@ -114,13 +118,12 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- //添加日志记录
|
|
|
- go services.AddCygxActivitySigninLog(item)
|
|
|
+ //添加日志记录
|
|
|
+ go services.AddCygxActivitySigninLog(item)
|
|
|
|
|
|
- //把报名信息写入签到到会表
|
|
|
- go services.AddCygxActivityOfflineMeetingDetail(activityId, user)
|
|
|
+ //把报名信息写入签到到会表
|
|
|
+ go services.AddCygxActivityOfflineMeetingDetail(activityId, user)
|
|
|
+ }
|
|
|
|
|
|
if user.Mobile != "" || total > 0 {
|
|
|
resp.IsBindingMobile = true
|
|
@@ -134,16 +137,18 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
detail.RealName = user.RealName
|
|
|
detail.CompanyName = user.CompanyName
|
|
|
|
|
|
+ //用于前端二次回显
|
|
|
if user.RealName == "" {
|
|
|
pars = make([]interface{}, 0)
|
|
|
- condition = " AND user_id = ? AND activity_id = ? "
|
|
|
- pars = append(pars, uid, activityId)
|
|
|
+ condition = " AND open_id = ? AND activity_id = ? "
|
|
|
+ pars = append(pars, user.OpenId, activityId)
|
|
|
signinDetail, err := models.GetCygxActivitySigninDetail(condition, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "签到失败"
|
|
|
br.ErrMsg = "获取失败GetCygxActivitySigninDetail,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
+ detail.BusinessCard = signinDetail.BusinessCard
|
|
|
detail.Mobile = signinDetail.Mobile
|
|
|
detail.RealName = signinDetail.RealName
|
|
|
detail.CompanyName = signinDetail.CompanyName
|
|
@@ -173,6 +178,7 @@ func (this *ActivitySignCoAntroller) ByHand() {
|
|
|
br.Ret = 408
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
uid := user.UserId
|
|
|
resp := new(models.CygxActivitySigninDetailResp)
|
|
|
var req models.CygxActivitySigninReq
|
|
@@ -216,8 +222,8 @@ func (this *ActivitySignCoAntroller) ByHand() {
|
|
|
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
- condition = " AND user_id = ? AND activity_id = ? "
|
|
|
- pars = append(pars, uid, activityId)
|
|
|
+ condition = " AND open_id = ? AND activity_id = ? "
|
|
|
+ pars = append(pars, user.OpenId, activityId)
|
|
|
total, err := models.GetCygxActivitySigninCount(condition, pars)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取失败"
|
|
@@ -273,6 +279,7 @@ func (this *ActivitySignCoAntroller) ByHand() {
|
|
|
item.CompanyName = user.CompanyName
|
|
|
item.IsSignup = totalMySuccess
|
|
|
item.BusinessCard = BusinessCard
|
|
|
+ item.OpenId = user.OpenId
|
|
|
item.CreateTime = time.Now()
|
|
|
if total == 0 {
|
|
|
err = models.AddCygxActivitySignin(item)
|
|
@@ -282,14 +289,27 @@ func (this *ActivitySignCoAntroller) ByHand() {
|
|
|
return
|
|
|
}
|
|
|
} else {
|
|
|
-
|
|
|
+ pars = make([]interface{}, 0)
|
|
|
+ condition = " AND open_id = ? AND activity_id = ? "
|
|
|
+ pars = append(pars, user.OpenId, activityId)
|
|
|
+ signinDetail, err := models.GetCygxActivitySigninDetail(condition, pars)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "签到失败"
|
|
|
+ br.ErrMsg = "获取失败GetCygxActivitySigninDetail,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ item.Id = signinDetail.Id
|
|
|
+ err = models.UpdateCygxActivitySignin(item)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "签到失败"
|
|
|
+ br.ErrMsg = "获取失败,UpdateCygxActivitySignin,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
detail := new(models.CygxActivitySigninResp)
|
|
|
if totalMySuccess > 0 {
|
|
|
detail.IsSignup = true
|
|
|
}
|
|
|
- item.RealName = RealName
|
|
|
- item.CompanyName = CompanyName
|
|
|
//添加日志记录
|
|
|
go services.AddCygxActivitySigninLog(item)
|
|
|
if user.CompanyId <= 1 {
|
|
@@ -298,8 +318,8 @@ func (this *ActivitySignCoAntroller) ByHand() {
|
|
|
detail.ActivityId = activityId
|
|
|
detail.ActivityName = activityInfo.ActivityName
|
|
|
detail.Mobile = Mobile
|
|
|
- detail.RealName = user.RealName
|
|
|
- detail.CompanyName = user.CompanyName
|
|
|
+ detail.RealName = RealName
|
|
|
+ detail.CompanyName = CompanyName
|
|
|
resp.Detail = detail
|
|
|
resp.IsBindingMobile = true
|
|
|
br.Ret = 200
|