Merge branch 'cygx_13.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -291,11 +291,13 @@ func GetAddActivityInfoByTitle(title, startDate, endDate string) (item *Activity
 // 通过纪要ID获取活动详情
 func GetAddActivityInfoByIdShow(uid, ActivityId int) (item *ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT *,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = a.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
+	sql := `SELECT a.*,t.activity_type,t.img_url_text,t.img_url_bg_yx,( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = a.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 = a.activity_id  AND s.is_cancel = 0 AND s.do_fail_type = 0) AS signup_num,
 			( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = a.activity_id AND m.user_id = ?  AND m.is_cancel = 0 ) AS is_cancel_meeting_reminder,
 			( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = a.activity_id AND ap.user_id = ? ) AS is_appointment
-			FROM cygx_activity AS a  WHERE activity_id=? AND publish_status = 1 `
+			FROM cygx_activity AS a 
+			INNER JOIN cygx_activity_type  as t ON t.activity_type_id = a.activity_type_id
+			WHERE a.activity_id=? AND a.publish_status = 1 `
 	err = o.Raw(sql, uid, uid, uid, ActivityId).QueryRow(&item)
 	return
 }

services/activity.go

@@ -3061,24 +3061,24 @@ func GetActivityImgMap(items []*models.ActivityDetail) (mapResp map[int]*models.
 		imgUrlChart = vslice[len(vslice)-1]
 		mapChart[chartName] = imgUrlChart
 	}
-
 	for _, v := range items {
+		//fmt.Println(v.ChartPermissionName)
 		//if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 		//	v.ImgUrlText = utils.YAN_XUAN_IMG
 		//}
+
+		item := new(models.ActivityImgUrlMapResp)
 		if v.ActivityType == 0 {
 			if mapAddress[v.City] != "" {
-				v.ImgUrl = mapAddress[v.City]
+				item.ImgUrl = mapAddress[v.City]
 			} else {
-				v.ImgUrl = mapAddress["其它"]
+				item.ImgUrl = mapAddress["其它"]
 			}
 		} else {
 			if mapChart[v.ChartPermissionName] != "" {
-				v.ImgUrl = mapChart[v.ChartPermissionName]
+				item.ImgUrl = mapChart[v.ChartPermissionName]
 			}
 		}
-		item := new(models.ActivityImgUrlMapResp)
-		item.ImgUrl = v.ImgUrl
 		mapResp[v.ActivityId] = item
 	}