Browse Source

no message

xingzai 1 year ago
parent
commit
5e3e512a75
3 changed files with 16 additions and 7 deletions
  1. 1 1
      controllers/activity.go
  2. 3 0
      models/activity_meet_detail_log.go
  3. 12 6
      services/activity_signin.go

+ 1 - 1
controllers/activity.go

@@ -538,7 +538,7 @@ func (this *ActivityCoAntroller) Detail() {
 		} else {
 			activityInfo.ArticleList = make([]*models.ActivityArticleResp, 0)
 		}
-		if (activityInfo.ActivityTypeId == 5 || activityInfo.ActivityTypeId == 6) && user.CompanyId == utils.HZ_COMPANY_ID {
+		if (activityInfo.ActivityTypeId == 5 || activityInfo.ActivityTypeId == 6) && services.GetBelongingRai(user.Mobile) {
 			activityInfo.IsShowSigninButton = true
 		}
 		//处理按钮是否展示问题

+ 3 - 0
models/activity_meet_detail_log.go

@@ -21,6 +21,9 @@ type CygxActivityMeetDetailLog struct {
 }
 
 func GetOfflineMeetingDetailListCompanyIdStr(companyIdStr string) (item []*CygxActivityMeetDetailLog, err error) {
+	if companyIdStr == "" {
+		return
+	}
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity_offline_meeting_detail WHERE company_id IN (` + companyIdStr + `)`
 	_, err = o.Raw(sql).QueryRows(&item)

+ 12 - 6
services/activity_signin.go

@@ -98,12 +98,12 @@ func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem
 		return
 	}
 
-	//修改活动是否提交到会状态
-	err = models.UpdateCygxActivitySubmitMeetingByActivityId(activityid)
-	if err != nil {
-		err = errors.New("UpdateCygxActivitySubmitMeetingByActivityId, Err: " + err.Error())
-		return
-	}
+	////修改活动是否提交到会状态
+	//err = models.UpdateCygxActivitySubmitMeetingByActivityId(activityid)
+	//if err != nil {
+	//	err = errors.New("UpdateCygxActivitySubmitMeetingByActivityId, Err: " + err.Error())
+	//	return
+	//}
 
 	//修改签到时间
 	err = models.UpdateCygxActivityOfflineMeetingDetailSigninTime(activityid, user.UserId)
@@ -143,6 +143,12 @@ func CygxActivityRestrictSignupByTask(cont context.Context) (err error) {
 		if err != nil {
 			return
 		}
+		//修改活动是否提交到会状态
+		err = models.UpdateCygxActivitySubmitMeetingByActivityId(v.ActivityId)
+		if err != nil {
+			err = errors.New("UpdateCygxActivitySubmitMeetingByActivityId, Err: " + err.Error())
+			return
+		}
 	}
 	return
 }