Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into cygx_10.3

models/activity.go

@@ -624,6 +624,14 @@ func UPdateSendedMsgStatus(signupIds string) (err error) {
 	return
 }
 
+// 修改是否推送消息状态
+func UPdateSendedYiDongSignUp(activityId int) (err error) {
+	sql := ` UPDATE cygx_activity SET  is_yidong_sign_up= 1  WHERE activity_id = ? `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, activityId).Exec()
+	return
+}
+
 // 修改是否推送消息状态
 func UPdateSendedMsgMeetingStatus(signupIds string) (err error) {
 	sql := ` UPDATE cygx_activity_meeting_reminder SET  is_send_wx_msg= 1  WHERE id IN(` + signupIds + `)`

models/activity_attendance_detail.go

@@ -28,7 +28,7 @@ type CygxActivityAttendanceDetail struct {
 	CrmCompanyMapStatusId int       `description:"转换后的对应状态信息：1=正式客户, 2=曾使用客户, 3=其他"`
 }
 
-//添加会议提醒信息
+// 添加会议提醒信息
 func AddCygxActivityAttendanceDetail(item *CygxActivityAttendanceDetail) (lastId int64, err error) {
 	o, err := orm.NewOrm().Begin()
 	defer func() {
@@ -106,6 +106,9 @@ type RoadshowData struct {
 }
 
 func AddAttendancDetail(items []*CygxActivityAttendanceDetail, activityId int, mobileStr string) (err error) {
+	if len(items) == 0 {
+		return
+	}
 	o := orm.NewOrm()
 	//修改活动是否上传到会信息字段
 	sql := `UPDATE cygx_activity SET  is_submit_meeting=1   WHERE activity_id=? `
@@ -143,7 +146,7 @@ func AddAttendancDetail(items []*CygxActivityAttendanceDetail, activityId int, m
 	return
 }
 
-//获取用户参会列表
+// 获取用户参会列表
 func GetRoadshowDataList(title, findStartDate, findEndDate string) (list []*RoadshowData, err error) {
 	o := orm.NewOrmUsingDB("comein_data")
 	sql := `SELECT * FROM roadshow_data WHERE roadshow_title LIKE '%` + title + `%' AND  roadshow_begin_time >= '` + findStartDate + `' AND roadshow_begin_time <= '` + findEndDate + `'`
@@ -151,7 +154,7 @@ func GetRoadshowDataList(title, findStartDate, findEndDate string) (list []*Road
 	return
 }
 
-//获取这个时段内的进门财经参会活动
+// 获取这个时段内的进门财经参会活动
 func GetRoadshowDataListByDateTime(findStartDate, findEndDate string) (list []*RoadshowData, err error) {
 	o := orm.NewOrmUsingDB("comein_data")
 	sql := `SELECT * FROM roadshow_data WHERE   roadshow_begin_time >= '` + findStartDate + `' AND roadshow_begin_time <= '` + findEndDate + `'   GROUP BY roadshow_title `
@@ -178,7 +181,7 @@ func GetWxUserOutboundMobile(mobileStr string) (item []*WxUserOutboundMobile, er
 	return
 }
 
-//我的日程列表
+// 我的日程列表
 func GetActivityAttendanceDetailList(activityIds string) (items []*CygxActivityAttendanceDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity_attendance_detail WHERE activity_id IN (` + activityIds + `) `
@@ -186,7 +189,7 @@ func GetActivityAttendanceDetailList(activityIds string) (items []*CygxActivityA
 	return
 }
 
-//我的日程列表
+// 我的日程列表
 func GetActivityAttendanceDetailListAll() (items []*CygxActivityAttendanceDetail, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_activity_attendance_detail WHERE  activity_id >= 1000 ORDER BY activity_id  ASC  `

services/activity.go

@@ -2088,3 +2088,15 @@ func GetActivityCityResp() (mapItem map[string]string, err error) {
 	mapItem = mapActivityCity
 	return
 }
+
+// UpdateIsSendYidongSignUp更改活动是否向易董推送报名名单的状态
+func UpdateIsSendYidongSignUp(activityId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("更改活动是否向易董推送报名名单的状态，失败,活动ID："+strconv.Itoa(activityId)+err.Error(), 2)
+		}
+	}()
+	err = models.UPdateSendedYiDongSignUp(activityId)
+	return
+}

services/chart.go

@@ -399,7 +399,7 @@ func DeleteCollectionChart(mobile string, chartId int) (err error) {
 func GetChartDetailByChartId(cont context.Context) (err error) {
 	listUpdate, err := models.GetChartCeluePushList()
 	if err != nil && err.Error() != utils.ErrNoRow() {
-		go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表ID："+err.Error(), 2)
+		go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表1ID："+err.Error(), 2)
 	}
 	//如果长度为零就不处理
 	if len(listUpdate) == 0 {
@@ -408,11 +408,11 @@ func GetChartDetailByChartId(cont context.Context) (err error) {
 	for _, v := range listUpdate {
 		err = GetChartDetailByApi(v.ChartId)
 		if err != nil {
-			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表ID："+strconv.Itoa(v.ChartId)+err.Error(), 2)
+			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表2ID："+strconv.Itoa(v.ChartId)+err.Error(), 2)
 		}
 		err = models.UpdateCygxChartCeluePush(v.ChartId)
 		if err != nil {
-			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表ID："+strconv.Itoa(v.ChartId)+err.Error(), 2)
+			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表3ID："+strconv.Itoa(v.ChartId)+err.Error(), 2)
 		}
 	}
 	return
@@ -427,7 +427,7 @@ func GetChartDetailByApi(chartId int) (err error) {
 	defer func() {
 		if err != nil {
 			//fmt.Println(err)
-			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表ID："+strconv.Itoa(chartId)+err.Error(), 2)
+			go utils.SendAlarmMsg("发送邮件：同步用户到策略平台信息失败，图表4ID："+strconv.Itoa(chartId)+err.Error(), 2)
 			go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ，图表ID："+strconv.Itoa(chartId)+"ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
 	}()

services/company_permission.go

@@ -154,7 +154,7 @@ func GetUserHasPermissionActivity(user *models.WxUserItem, activityInfo *models.
 		if applyCount > 0 {
 			hasPermission = 4
 		} else {
-			hasPermission = 5
+			hasPermission = 3
 		}
 		return
 	}

services/send_company_user.go

@@ -50,7 +50,7 @@ type OriginalUserInfoResp struct {
 	RealName string `json:"RealName"`
 }
 
-//c
+// c
 func SendComapnyToShanghai(url, jsonCompany, postType string) (err error) {
 	var msg string
 	defer func() {
@@ -158,7 +158,7 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
-	condition = ` AND p.is_suspend = 0  AND p.modify_time > ` + "'" + updateTime + "'"
+	condition = ` AND p.is_suspend = 0  AND a.modify_time > ` + "'" + updateTime + "'"
 	companyIds = strings.TrimRight(companyIds, ",")
 
 	fmt.Println("获取冻结跟流失的用户", len(listFreezeAndLoss))
@@ -510,7 +510,7 @@ func DotongbuShangHaiSendEmail(cont context.Context) (err error) {
 	return
 }
 
-//DeleteUserDotongbuShangHaApi 删除用户进行同步
+// DeleteUserDotongbuShangHaApi 删除用户进行同步
 func DeleteUserDotongbuShangHaiApi() (err error) {
 	var msg string
 	defer func() {
@@ -581,7 +581,7 @@ func DeleteUserDotongbuShangHaiApi() (err error) {
 	return
 }
 
-//获取用户的Token
+// 获取用户的Token
 func GetShangHaiCrmApiToken() (token string, err error) {
 	var msg string
 	defer func() {
@@ -627,7 +627,7 @@ func GetShangHaiCrmApiToken() (token string, err error) {
 	return
 }
 
-//处理被禁用的用户，将禁用用户的状态转冻结
+// 处理被禁用的用户，将禁用用户的状态转冻结
 func CompanySuspend() (err error) {
 	var msg string
 	defer func() {

services/yidong.go

@@ -797,6 +797,7 @@ func YidongActivityGroup(subjectName string, activityId int) (err error) {
 
 // 会前一小时将，报名信息同步到易董
 func YiDongSignAppointmentsForThird(cont context.Context) (err error) {
+	//func YiDongSignAppointmentsForThird() (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
@@ -807,7 +808,7 @@ func YiDongSignAppointmentsForThird(cont context.Context) (err error) {
 	var condition string
 	startDate := time.Now().Add(+time.Minute * 45).Format(utils.FormatDateTime)
 	endDate := time.Now().Add(+time.Minute * 60).Format(utils.FormatDateTime)
-	condition = " AND yidong_activity_id_by_cygx != ''  AND activity_time  BETWEEN ?  AND  ? "
+	condition = " AND  is_yidong_sign_up = 0 AND yidong_activity_id_by_cygx != ''  AND activity_time  BETWEEN ?  AND  ? "
 	pars = append(pars, startDate, endDate)
 	activityList, err := models.GetActivityListByCondition(condition, pars)
 	if err != nil {
@@ -816,6 +817,7 @@ func YiDongSignAppointmentsForThird(cont context.Context) (err error) {
 	url := utils.YiDongHuaWeiYunUrl + "app/hz/signAppointmentsForThird"
 	var outCallStatus string
 	for _, v := range activityList {
+		go UpdateIsSendYidongSignUp(v.ActivityId)
 		var parsSignUp []interface{}
 		var conditionSignUp string
 		conditionSignUp += ` AND activity_id = ?`