no message

models/activity.go

@@ -879,11 +879,9 @@ GROUP BY
 func GetActivityMsgExport(activityId int) (item []*ActivityMsgExportRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			k.*,
-			u.real_name 
+			k.*
 			FROM
 			cygx_activity_help_ask AS k
-			LEFT JOIN wx_user AS u ON u.user_id = k.user_id 
 			WHERE
 			k.activity_id = ? 
 			GROUP BY

models/activity_signup.go

@@ -147,8 +147,9 @@ func AddActivitySignupFromEmail(item *CygxActivitySignup) (lastId int64, err err
 	}()
 	var count int
 	var countMySchedule int
+	ow := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET outbound_mobile=? ,outbound_country_code = ? ,is_msg_outbound_mobile = 1   WHERE user_id=? `
-	_, err = o.Raw(sql, item.OutboundMobile, item.CountryCode, item.UserId).Exec()
+	_, err = ow.Raw(sql, item.OutboundMobile, item.CountryCode, item.UserId).Exec()
 	if err != nil {
 		return
 	}

models/apply_record.go

@@ -41,37 +41,6 @@ type CygxApplyRecordResp struct {
 	ApplicationSource   string    `description:"申请来源"`
 }
 
-func AddApplyRecordold(item *ApplyTryReq, mobile, companyNamePay string, userId, companyIdPay, CompanyIdType int) (err error) {
-	o, err := orm.NewOrm().Begin()
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			o.Rollback()
-		} else {
-			o.Commit()
-		}
-	}()
-
-	sql := `INSERT INTO cygx_apply_record (user_id,business_card_url, real_name,company_name, mobile,create_time, apply_method,company_id_pay,company_name_pay,company_id_type)
-          VALUES(?,?,?,?,?,?,?,?,?,?) `
-	_, err = o.Raw(sql, userId, item.BusinessCardUrl, item.RealName, item.CompanyName, mobile, time.Now(), item.ApplyMethod, companyIdPay, companyNamePay, CompanyIdType).Exec()
-	if err != nil {
-		return
-	}
-	msql := `UPDATE  wx_user
-		SET
-		  note = ?,
-		  is_note = 1,
-		  apply_method = ?,
-          real_name=?,
-		  mobile=?
-		WHERE user_id = ? `
-	_, err = o.Raw(msql, item.CompanyName, item.ApplyMethod, item.RealName, mobile, userId).Exec()
-	return
-}
-
 func AddApplyRecord(item *CygxApplyRecord) (err error) {
 	o, err := orm.NewOrm().Begin()
 	if err != nil {

models/wx_user.go

@@ -390,24 +390,6 @@ type UserLabel struct {
 	Label string `description:"标签 多个用  , 隔开"`
 }
 
-// 对获取关注的产业
-func GetCygxCompanyUserListSplit(userIds string) (labels string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			(
-			SELECT
-				GROUP_CONCAT( DISTINCT man.industry_name SEPARATOR ',' ) 
-			FROM
-				cygx_industrial_management AS man 
-			WHERE
-				man.industrial_management_id IN ( SELECT industrial_management_id FROM cygx_industry_fllow AS f WHERE f.user_id = u.user_id  AND f.type = 1 ) 
-			) AS labels
-		FROM
-			wx_user AS u WHERE  u.user_id  = ? `
-	err = o.Raw(sql, userIds).QueryRow(&labels)
-	return
-}
-
 // 阅读记录
 type ArticlePvCountResp struct {
 	ArticleId int `description:"文章ID"`

models/wx_user_white.go

@@ -60,6 +60,7 @@ func GetWxUserWhiteMobile() (mobileStr string, err error) {
 
 // 获取用户外呼手机号白名单
 func GetWxUserWhiteOutboundMobile() (mobileStr string, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
 			GROUP_CONCAT( DISTINCT u.outbound_mobile SEPARATOR ',' ) AS outboundmobileStr 
 			FROM
@@ -76,7 +77,6 @@ func GetWxUserWhiteOutboundMobile() (mobileStr string, err error) {
 				AND cp.status IN ( '正式', '试用' )
 				AND u.mobile != ''
 				AND u.mobile !=  u.outbound_mobile `
-	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql).QueryRow(&mobileStr)
 	return
 }

services/activity.go

@@ -1851,115 +1851,6 @@ func ActivityAttendanceDetail(cont context.Context) (err error) {
 	return
 }
 
-// 判断是否加入黑名单
-func AddCygxActivityRestrictSignupByAdmin111(activityId int) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err)
-			go utils.SendAlarmMsg("判断是否加入黑名单记录失败"+err.Error(), 2)
-		}
-	}()
-	total, err := models.GetActivitySignupNomeetingCount(activityId)
-	if err != nil {
-		err = errors.New("GetActivitySignupNomeetingCount" + err.Error())
-		return err
-	}
-	if total == 0 {
-		return err
-	}
-	mobileList, _ := models.GetUserMeetingMobile(activityId)
-	if len(mobileList) >= 0 {
-		for _, v := range mobileList {
-			totalRestrict, err := models.GetRestrictSignupCountByUid(v.UserId)
-			if err != nil {
-				err = errors.New("GetRestrictSignupCountByUid" + err.Error())
-				return err
-			}
-			totalNomeet, err := models.GetActivitySignupNomeetingCountByUid(v.UserId)
-			if err != nil {
-				err = errors.New("GetActivitySignupNomeetingCountByUid" + err.Error())
-				return err
-			}
-			if totalRestrict > 0 && totalNomeet < 3 {
-				err = models.DeleteCygxActivityRestrictSignup(v.UserId)
-				if err != nil {
-					err = errors.New("DeleteCygxActivityRestrictSignup" + err.Error())
-					return err
-				}
-			}
-		}
-	}
-
-	list, err := models.GetActivitySignupNomeetingCountList(activityId)
-	if err != nil {
-		err = errors.New("GetActivitySignupNomeetingCountList" + err.Error())
-		return err
-	}
-	var items []*models.CygxActivitySignupBreak
-	for _, v := range list {
-		totalRestrict, err := models.GetRestrictSignupCountByUid(v.UserId)
-		if err != nil {
-			err = errors.New("GetRestrictSignupCountByUid" + err.Error())
-			return err
-		}
-		totalNomeet, err := models.GetActivitySignupNomeetingCountByUid(v.UserId)
-		if err != nil {
-			err = errors.New("GetActivitySignupNomeetingCountByUid" + err.Error())
-			return err
-		}
-		if totalNomeet >= 3 {
-			if totalRestrict == 0 {
-				infoUser, err := models.GetUserAndCompanyNameList(v.UserId)
-				//if err != nil && err.Error() != utils.ErrNoRow() {
-				if err != nil {
-					err = errors.New("GetUserAndCompanyNameList" + err.Error())
-					return err
-				}
-				if infoUser != nil {
-					item := new(models.CygxActivityRestrictSignup)
-					item.UserId = infoUser.UserId
-					item.CreateTime = time.Now()
-					item.Mobile = infoUser.Mobile
-					item.Email = infoUser.Email
-					item.CompanyId = infoUser.CompanyId
-					item.CompanyName = infoUser.CompanyName
-					item.IsRestrict = 1
-					err = models.AddCygxActivityRestrictSignup(item)
-					if err != nil {
-						err = errors.New("AddCygxActivityRestrictSignup" + err.Error())
-						return err
-					}
-				}
-			}
-		}
-
-		//处理未到会
-		item := new(models.CygxActivitySignupBreak)
-		item.UserId = v.UserId
-		item.ActivityId = v.ActivityId
-		item.CreateTime = time.Now()
-		item.Mobile = v.Mobile
-		item.Email = v.Email
-		item.CompanyId = v.CompanyId
-		item.CompanyName = v.CompanyName
-		item.RealName = v.RealName
-		item.SellerName = v.SellerName
-		items = append(items, item)
-	}
-
-	err = models.DeleteCygxActivitySignupBreakById(activityId)
-	if err != nil {
-		err = errors.New("DeleteCygxActivitySignupBreakById" + err.Error())
-		return
-	}
-	_, err = models.AddCygxActivitySignupBreakList(items)
-	if err != nil {
-		err = errors.New("AddCygxActivitySignupBreakList, Err: " + err.Error())
-		return
-	}
-	return
-}
-
 // 查研观向处理活动用户限制报名
 func AddCygxActivityRestrictSignupByAdmin(activityId int) (err error) {
 	defer func() {