|
@@ -139,8 +139,9 @@ func (this *ActivitySignCoAntroller) Detail() {
|
|
|
//线下调研活动扫码签到给对应销售发模版消息
|
|
|
services.SendActivitieSignTemplateMsg(user, activityInfo)
|
|
|
}
|
|
|
-
|
|
|
- if total == 0 && user.CompanyId > 1 || (user.Mobile != "" && applyCount > 0) {
|
|
|
+ //1,没有签到记录不为潜在客户
|
|
|
+ //2,没有签到记录,手机号不为空,没有申请记录
|
|
|
+ if total == 0 && user.CompanyId > 1 || (user.Mobile != "" && applyCount == 0 && total == 0) {
|
|
|
resp.IsBindingMobile = true
|
|
|
}
|
|
|
if user.CompanyId == 1 {
|
|
@@ -400,27 +401,55 @@ func (this *ActivitySignCoAntroller) SignupDetail() {
|
|
|
var pars []interface{}
|
|
|
condition = ` AND activity_id = ? `
|
|
|
pars = append(pars, activityId)
|
|
|
- listOfflineMeeting, err := models.GetOfflineMeetingListWithUser(condition, pars)
|
|
|
|
|
|
+ listOfflineMeeting, err := models.GetOfflineMeetingListWithUser(condition, pars)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "GetOfflineMeetingListWithUser,UserId:" + strconv.Itoa(user.UserId)
|
|
|
+ return
|
|
|
+ }
|
|
|
UserMobileMap, err := services.GetAdminCheckUserMobileMap(user)
|
|
|
if err != nil {
|
|
|
- br.Msg = "你暂无查看权限"
|
|
|
- br.ErrMsg = "你暂无查看权限,UserId:" + strconv.Itoa(user.UserId)
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "GetAdminCheckUserMobileMap,UserId:" + strconv.Itoa(user.UserId)
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- for _, v := range listOfflineMeeting {
|
|
|
- if _, ok := UserMobileMap[v.Mobile]; !ok {
|
|
|
- item := new(models.CygxActivitySignupResp)
|
|
|
- item.RealName = v.RealName
|
|
|
- item.CompanyName = v.CompanyName
|
|
|
- item.IsMeeting = v.IsMeeting
|
|
|
- if v.IsMeeting == 1 {
|
|
|
- item.SigninTime = v.SigninTime
|
|
|
+ //如果签到表没有记录就去报名表去找
|
|
|
+ if len(listOfflineMeeting) == 0 {
|
|
|
+ pars = make([]interface{}, 0)
|
|
|
+ condition = ` AND do_fail_type = 0 AND activity_id = ?`
|
|
|
+ pars = append(pars, activityId)
|
|
|
+ listSignup, err := models.GetActivitySignupList(condition, pars)
|
|
|
+ if err != nil && err.Error() != utils.ErrNoRow() {
|
|
|
+ br.Msg = "获取信息失败"
|
|
|
+ br.ErrMsg = "GetActivitySignupList,UserId:" + strconv.Itoa(user.UserId)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if len(listSignup) > 0 {
|
|
|
+ for _, v := range listSignup {
|
|
|
+ if _, ok := UserMobileMap[v.Mobile]; ok {
|
|
|
+ item := new(models.CygxActivitySignupResp)
|
|
|
+ item.RealName = v.RealName
|
|
|
+ item.CompanyName = v.CompanyName
|
|
|
+ resp.List = append(resp.List, item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ for _, v := range listOfflineMeeting {
|
|
|
+ if _, ok := UserMobileMap[v.Mobile]; ok {
|
|
|
+ item := new(models.CygxActivitySignupResp)
|
|
|
+ item.RealName = v.RealName
|
|
|
+ item.CompanyName = v.CompanyName
|
|
|
+ item.IsMeeting = v.IsMeeting
|
|
|
+ if v.IsMeeting == 1 {
|
|
|
+ item.SigninTime = v.SigninTime
|
|
|
+ }
|
|
|
+ resp.List = append(resp.List, item)
|
|
|
}
|
|
|
- resp.List = append(resp.List, item)
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
if len(resp.List) == 0 {
|
|
|
resp.List = make([]*models.CygxActivitySignupResp, 0)
|
|
|
}
|