no message

controllers/cygx/activity_meet.go

@@ -342,25 +342,28 @@ func (this *ActivityMeetCoAntroller) MeetingDo() {
 	}
 
 	var conditionOld string //点了到会，又点了取消的人，对应的活动标签给取消掉
-	conditionOld += ` AND s.is_meeting = 1  AND s.is_cancel = 0 AND s.do_fail_type =0 AND s.activity_id = ` + strconv.Itoa(activityId)
-	listOld, err := cygx.GetCygxActivitySignup(conditionOld)
+	conditionOld += ` AND s.is_meeting = 1  AND  s.activity_id = ` + strconv.Itoa(activityId)
+	listOld, err := cygx.GetOfflineMeetingList(conditionOld)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+
 	var deleteUserids []int
 	sliceNew := strings.Split(meetingUids, ",")
 	mapNewUserIds := make(map[string]bool)
 	for _, v := range sliceNew {
 		mapNewUserIds[v] = true
 	}
+
 	for _, v := range listOld {
 		if !mapNewUserIds[strconv.Itoa(v.UserId)] {
 			deleteUserids = append(deleteUserids, v.UserId)
 		}
 	} //点了到会，又点了取消的人，对应的活动标签给取消掉 end
 
+	//return
 	//加入缓存机制，避免创建同一个名称的指标 end
 	activityInfo, errInfo := cygx.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {

controllers/cygx/user.go

@@ -206,9 +206,16 @@ func (this *UserController) List() {
 		}
 	}
 
+	var joinTable string
+	var tableField string
+	var labelSort string
 	if label != "" && utf8.RuneCountInString(label) > 1 {
 		//usercondition += ` AND u.user_label LIKE '%` + label + `%'`
-		usercondition += ` AND u.user_id IN ( SELECT user_id  FROM ` + utils.GetCygxDatabase() + `.wx_user_rai_label WHERE label LIKE '%` + label + `%'  AND create_time >= '` + time.Now().AddDate(0, -4, 0).Format(utils.FormatDate) + `' ) `
+		//usercondition += ` AND u.user_id IN ( SELECT user_id  FROM ` + utils.GetCygxDatabase() + `.wx_user_rai_label WHERE label LIKE '%` + label + `%'  AND create_time >= '` + time.Now().AddDate(0, -4, 0).Format(utils.FormatDate) + `' ) `
+		usercondition += ` AND l.label LIKE '%` + label + `%'  AND l.create_time >= '` + time.Now().AddDate(0, -4, 0).Format(utils.FormatDate) + `' `
+		joinTable = ` 	INNER JOIN ` + utils.GetCygxDatabase() + `.wx_user_rai_label as l ON  l.user_id = u.user_id   `
+		tableField = ` MAX(l.create_time) as max_create_time,   `
+		labelSort = `  max_create_time DESC ,   `
 	}
 
 	//
@@ -222,23 +229,23 @@ func (this *UserController) List() {
 		usercondition += ` AND u.cygx_subscribe = 1 `
 	}
 	condition += ` AND cp.product_id = 2  `
-	total, err := cygx.GetCompanyListCount(usercondition, keyWord, kwywordcondition, condition, roleTypeCode, pars)
+	total, err := cygx.GetCompanyListCount(joinTable, usercondition, keyWord, kwywordcondition, condition, roleTypeCode, pars)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据总数失败，Err:" + err.Error()
 		return
 	}
 	if sortType == "" {
-		sqlOrder = ` GROUP by u.user_id  ORDER BY c.created_time  DESC, u.register_time  DESC `
+		sqlOrder = ` GROUP by u.user_id  ORDER BY ` + labelSort + ` c.created_time  DESC, u.register_time  DESC `
 	} else {
 		if sortType == "asc" {
-			sqlOrder = ` GROUP by u.user_id  ORDER BY u.interaction_num  ASC , u.register_time  DESC `
+			sqlOrder = ` GROUP by u.user_id  ORDER BY  u.interaction_num  ASC ,` + labelSort + ` u.register_time  DESC `
 		} else {
-			sqlOrder = ` GROUP by u.user_id  ORDER BY u.interaction_num  DESC , u.register_time  DESC  `
+			sqlOrder = ` GROUP by u.user_id  ORDER BY u.interaction_num  DESC , ` + labelSort + `  u.register_time  DESC  `
 		}
 	}
 
-	list, err := cygx.GetCygxCompanyUserList(usercondition, keyWord, kwywordcondition, condition, roleTypeCode, sqlOrder, parsUser, startSize, pageSize)
+	list, err := cygx.GetCygxCompanyUserList(joinTable, tableField, usercondition, keyWord, kwywordcondition, condition, roleTypeCode, sqlOrder, parsUser, startSize, pageSize)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()

controllers/roadshow/calendar_meeting_user.go

@@ -274,18 +274,18 @@ func (this *CalendarMeetingUserController) Delete() {
 
 	rsCalendarMeetingUserId := req.RsCalendarMeetingUserId
 
-	rsCalendarMeetingUserItem, err := roadshow.GetRsCalendarMeetingUserByRsCalendarMeetingUserId(rsCalendarMeetingUserId)
-	if err != nil {
-		br.Msg = "获取数据失败！"
-		br.ErrMsg = "获取数据失败！GetRsCalendarMeetingUserFirst:" + err.Error()
-		return
-	}
-	err = cygx.DeleteWxUserRaiLabelWithRoadshow(rsCalendarMeetingUserItem.UserId, rsCalendarMeetingUserItem.RsCalendarId) // 路演到会删除后，删除对应的标签
-	if err != nil {
-		br.Msg = "删除失败！"
-		br.ErrMsg = "删除失败-DeleteWxUserRaiLabelWithRoadshow！Err:" + err.Error()
-		return
-	}
+	//rsCalendarMeetingUserItem, err := roadshow.GetRsCalendarMeetingUserByRsCalendarMeetingUserId(rsCalendarMeetingUserId)
+	//if err != nil {
+	//	br.Msg = "获取数据失败！"
+	//	br.ErrMsg = "获取数据失败！GetRsCalendarMeetingUserFirst:" + err.Error()
+	//	return
+	//}
+	//err = cygx.DeleteWxUserRaiLabelWithRoadshow(rsCalendarMeetingUserItem.UserId, rsCalendarMeetingUserItem.RsCalendarId) // 路演到会删除后，删除对应的标签
+	//if err != nil {
+	//	br.Msg = "删除失败！"
+	//	br.ErrMsg = "删除失败-DeleteWxUserRaiLabelWithRoadshow！Err:" + err.Error()
+	//	return
+	//}
 
 	err = roadshow.DeleteRsCalendarMeetingUser(rsCalendarMeetingUserId)
 	if err != nil {

models/cygx/cygx_user.go

@@ -65,7 +65,7 @@ type CompanyUserListResp struct {
 }
 
 // 获取数量
-func GetCompanyListCount(userCondition, keyWord, kwywordcondition, condition, roleTypeCode string, pars []interface{}) (count int, err error) {
+func GetCompanyListCount(joinTable, userCondition, keyWord, kwywordcondition, condition, roleTypeCode string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrm()
 	companyCondition := `SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
 	kwywordcondition = companyCondition + kwywordcondition
@@ -79,7 +79,7 @@ func GetCompanyListCount(userCondition, keyWord, kwywordcondition, condition, ro
 			INNER JOIN company AS c ON c.company_id = u.company_id
 			INNER JOIN company_product AS cp ON cp.company_id = c.company_id
 			INNER JOIN admin AS m ON m.admin_id = cp.seller_id 
-			INNER JOIN user_seller_relation AS sr ON sr.user_id = u.user_id 
+			INNER JOIN user_seller_relation AS sr ON sr.user_id = u.user_id ` + joinTable + `
 			 WHERE  u.company_id IN (` + companyCondition + `)`
 	if userCondition != "" {
 		sql += userCondition
@@ -97,14 +97,14 @@ func GetCompanyListCount(userCondition, keyWord, kwywordcondition, condition, ro
 }
 
 // 列表
-func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition, roleTypeCode, sqlOrder string, pars []interface{}, startSize, pageSize int) (items []*CygxCompanyUser, err error) {
+func GetCygxCompanyUserList(joinTable, tableField, userCondition, keyWord, kwywordcondition, condition, roleTypeCode, sqlOrder string, pars []interface{}, startSize, pageSize int) (items []*CygxCompanyUser, err error) {
 	o := orm.NewOrm()
 	companyCondition := `SELECT a.company_id FROM company AS a  INNER JOIN company_product AS b ON a.company_id=b.company_id   WHERE a.enabled=1  `
 	kwywordcondition = companyCondition + kwywordcondition
 	if condition != "" {
 		companyCondition += condition
 	}
-	sql := `SELECT
+	sql := `SELECT` + tableField + `
 			u.user_id,
 			u.mobile,
 			u.email,
@@ -130,7 +130,7 @@ func GetCygxCompanyUserList(userCondition, keyWord, kwywordcondition, condition,
 			INNER JOIN company AS c ON c.company_id = u.company_id
 			INNER JOIN company_product AS cp ON cp.company_id = c.company_id
 			INNER JOIN admin AS m ON m.admin_id = cp.seller_id 
-			INNER JOIN user_seller_relation AS sr ON sr.user_id = u.user_id 
+			INNER JOIN user_seller_relation AS sr ON sr.user_id = u.user_id ` + joinTable + `
 			 WHERE u.company_id IN (` + companyCondition + `)`
 	if userCondition != "" {
 		sql += userCondition

services/cygx/acitvity.go

@@ -44,7 +44,7 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 	}
 	mobileList, _ := cygx.GetUserMeetingMobile(activityId)
 	var userIdArr []int
-	if len(mobileList) >= 0 {
+	if len(mobileList) > 0 {
 		for _, v := range mobileList {
 			userIdArr = append(userIdArr, v.UserId)
 		}
@@ -56,7 +56,7 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 		pars = append(pars, userIdArr)
 		restrictSignupList, e := cygx.GetCygxActivityRestrictSignupList(condition, pars, 0, 9999)
 		if e != nil {
-			err = errors.New("GetCygxActivityRestrictSignupList" + e.Error())
+			err = errors.New("GetCygxActivityRestrictSignupList 1 " + e.Error())
 			return
 		}
 		//获取这些用户是否被加入到限制报名了
@@ -120,7 +120,7 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 		item.SellerName = v.SellerName
 		items = append(items, item)
 	}
-	if len(list) == 0 {
+	if len(userIdSiginArr) == 0 {
 		return
 	}
 
@@ -133,7 +133,7 @@ func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 	pars = append(pars, userIdSiginArr)
 	restrictSignupList, e := cygx.GetCygxActivityRestrictSignupList(condition, pars, 0, 9999)
 	if e != nil {
-		err = errors.New("GetCygxActivityRestrictSignupList" + e.Error())
+		err = errors.New("GetCygxActivityRestrictSignupList 2" + e.Error())
 		return
 	}
 	//获取这些用户是否被加入到限制报名了

services/cygx/activity_meet.go

@@ -100,7 +100,7 @@ func AddCygxActivityMeetDetailLogOffline(meetingUids string, activityId int) (er
 			itemsUpdateCompany = append(itemsUpdateCompany, item)
 		}
 	}
-	fmt.Println(111)
+
 	var itemsUpdateMobile []*cygx.MeetDetailLoggGroupCount
 	lenmobileArr := len(mobileArr)
 	if lenmobileArr > 0 {