fix 冲突

controllers/activity.go

@@ -1951,7 +1951,7 @@ func (this *ActivityController) ScheduleList() {
 			list[k].VideoDetail = mapActivityVideo[v.ActivityId]
 		}
 		//处理列表的标签是否展示逻辑
-		resp.List = append(resp.List, services.ActivityButtonShow(v))
+		resp.List = append(resp.List, services.ActivityButtonShow(v, user))
 	}
 	resp.Paging = page
 	br.Ret = 200

models/activity.go

@@ -404,3 +404,105 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 	_, err = o.Raw(sql, pars, parsSpecil, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+
+//获取我的日程数量
+func GetScheduleCount(condition string, uid int) (count int, err error) {
+	o := orm.NewOrm()
+	sqlCount := `SELECT COUNT( 1 ) AS count 
+				FROM cygx_my_schedule AS m
+				INNER JOIN cygx_activity AS art ON art.activity_id = m.activity_id 
+				WHERE
+				user_id = ?`
+	if condition != "" {
+		sqlCount += condition
+	}
+	err = o.Raw(sqlCount, uid).QueryRow(&count)
+	return
+}
+
+//我的日程列表
+func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
+			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,
+            ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num ,
+			( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment,
+			( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.is_cancel = 0 AND m.user_id = ? ) AS is_cancel_meeting_reminder
+            FROM cygx_activity AS art
+			INNER JOIN cygx_my_schedule as my ON my.activity_id = art.activity_id 
+			INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id
+			INNER JOIN  chart_permission  AS c ON c.chart_permission_id = art.chart_permission_id 
+            WHERE 1=1 AND my.user_id = ? `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY art.active_state ASC,art.activity_time ASC  LIMIT ?,?`
+	_, err = o.Raw(sql, pars, uid, uid, uid, uid, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+//我的日程列表 活动以及专项调研一起
+func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpecil string, parsSpecil []interface{}, startSize, pageSize int) (items []*ActivityDetail, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			art.activity_id,
+			art.activity_time_text,
+			art.activity_name,
+			art.chart_permission_id,
+			art.active_state,
+			t.activity_type,
+			art.chart_permission_name,
+			art.distinguished_guest,
+			art.expert,
+			art.speaker,
+			"" AS trip_img_link,
+			"" AS activity_time_end,
+			art.yidong_activity_id,
+			art.is_can_appointment_minutes,
+			art.activity_type_id,
+			art.limit_people_num,
+			1 AS source_type,
+			art.activity_time 
+		FROM
+			cygx_activity AS art
+			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
+			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
+			INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
+		WHERE
+			1 = 1 `
+	if condition != `` {
+		sql += condition
+	}
+	sql += ` UNION ALL
+		SELECT
+			art.activity_id,
+			art.activity_time_text_by_day AS activity_time_text,
+			art.research_theme AS activity_name,
+			art.chart_permission_id,
+			"",
+			art.special_type AS activity_type,
+			art.chart_permission_name,
+			"",
+			"",
+			"",
+			art.trip_img_link_fix AS trip_img_link,
+			art.activity_time_end,
+			"",
+			"",
+			"",
+			"",
+			2 AS source_type,
+			art.activity_time 
+		FROM
+			cygx_activity_special AS art
+			INNER JOIN cygx_activity_special_trip AS my ON my.activity_id = art.activity_id 
+		WHERE
+			1 = 1`
+	if conditionSpecil != "" {
+		sql += conditionSpecil
+	}
+	sql += ` ORDER BY activity_time DESC   LIMIT ?,?`
+	_, err = o.Raw(sql, pars, parsSpecil, startSize, pageSize).QueryRows(&items)
+	return
+}

models/activity_video.go

@@ -134,10 +134,3 @@ type ActivityVideoDetailResp struct {
 	AuthInfo    *UserPermissionAuthInfo
 }
 
-// GetCygxActivityVideoById 获取活动视频
-func GetCygxActivityVideoById(activityId int) (item *CygxActivityVideo, err error) {
-	sql := `SELECT * FROM cygx_activity_video WHERE video_id = ? LIMIT 1 `
-	err = orm.NewOrm().Raw(sql, activityId).QueryRow(&item)
-	return
-}
-

models/activity_voice.go

@@ -35,7 +35,6 @@ type CygxActivityVoiceResp struct {
 // ActivityVoiceReq 音频数据
 type CygxActivityVoiceReq struct {
 	ActivityId  int    ` description:"活动ID"`
-	ActivityVoiceId int    ` description:"音频ID"`
 	Url         string `description:"音频资源url地址"`
 	Name        string `description:"音频名称"`
 	PlaySeconds int    `description:"音频时长"`
@@ -51,7 +50,6 @@ func GetCygxActivityVoiceReqList(activityIds []int) (items []*CygxActivityVoiceR
 	//endTime := time.Now().AddDate(0, 0, -30).Format("2006-01-02 15:04:05")
 	sql := `SELECT
 			v.activity_id,
-			v.activity_voice_id,
 			v.voice_url AS url,
 			v.voice_name AS name,
 			v.voice_play_seconds AS play_seconds 

routers/router.go

@@ -89,7 +89,6 @@ func init() {
 		web.NSNamespace("/activity",
 			web.NSInclude(
 				&controllers.ActivityController{},
-				&controllers.ActivityABaseController{},
 			),
 		),
 		web.NSNamespace("/activity_special",

services/activity_special.go

@@ -783,27 +783,3 @@ func SendWxMsgActivitySpecial10(activityInfo *models.CygxActivitySpecialDetail)
 	}
 	return
 }
-
-//获取用户已经报名的活动
-func GetSpecialTripUserMap(activityIds []int, userId int) (mapUserId map[int]int, err error) {
-	var condition string
-	var pars []interface{}
-	activityIdsLen := len(activityIds)
-	if activityIdsLen > 0 {
-		condition += ` AND activity_id IN (` + utils.GetOrmInReplace(activityIdsLen) + `)`
-		pars = append(pars, activityIds)
-	}
-	condition += ` AND user_id = ?  AND is_cancel = 0 `
-	pars = append(pars, userId)
-	list, e := models.GetCygxActivitySpecialTripList(condition, pars)
-	if e != nil {
-		err = errors.New("GetCygxActivitySpecialTripList, Err: " + e.Error())
-		return
-	}
-	mapUid := make(map[int]int)
-	for _, v := range list {
-		mapUid[v.ActivityId] = v.UserId
-	}
-	mapUserId = mapUid
-	return
-}

utils/constants.go

@@ -84,7 +84,6 @@ const (
 	OnlineTime                       string = "2021-06-01 00:00:01" //上线时间
 	HONG_GUAN_ID                     int    = 1
 	HZ_COMPANY_ID                    int    = 16
-	C_CLASS_ACTIVITY_TYPE_ID         int    = 7 //C类电话会会议ID
 )
 
 //模板消息推送类型
@@ -150,7 +149,3 @@ const (
 	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
 )
 
-const (
-	YI_YAO_QI_TA = "https://hzstatic.hzinsights.com/static/temp/20220922202209/20220922/2OQMBFplQE1R3bX1y3obX7JSwSuA.png"
-	YAN_XUAN_IMG = "https://hzstatic.hzinsights.com/static/temp/20221027202210/20221027/Dd8TrsMh8tNx2tGd5VeaQDyJVQfV.png"
-)