Merge branch 'crm/crm_16.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/calendar.go

@@ -196,7 +196,7 @@ func (this *CalendarController) Add() {
 
 	//如果是权益客户，添加销售跟共享销售的信息
 	var productItemRai *company.CompanyProduct
-	if req.CompanyId > 0 {
+	if req.CompanyId > 0 && req.ActivityType == "路演" {
 		productItemRai, err = company.GetCompanyProductByCompanyIdAndProductId(req.CompanyId, utils.COMPANY_PRODUCT_RAI_ID)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "客户信息有误"
@@ -1174,9 +1174,9 @@ func (this *CalendarController) CalendarList() {
 	roleTypeCode := sysUser.RoleTypeCode
 	//销售
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+		//roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_GROUP ||
-		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP ||
+		//roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_FICC_TEAM ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
 		condition += ` AND a.sys_user_id=?`
@@ -1184,6 +1184,15 @@ func (this *CalendarController) CalendarList() {
 		//condition += ` AND a.activity_type IN('路演','公开会议') `
 	}
 
+	//权益销售
+	if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_SELLER ||
+		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_GROUP {
+		//if calendarType == 2 {
+		condition += ` AND  ( a.sys_user_id=?  OR a.seller_id=?  OR a.share_seller_id=?  )  `
+		pars = append(pars, sysUser.AdminId, sysUser.AdminId, sysUser.AdminId)
+		//}
+	}
+
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RESEARCHR ||
 		roleTypeCode == utils.ROLE_TYPE_CODE_RAI_RESEARCHR ||
@@ -1223,7 +1232,7 @@ func (this *CalendarController) CalendarList() {
 		br.ErrMsg = "参数错误,calendarType:" + strconv.Itoa(calendarType)
 		return
 	}
-
+	fmt.Println(condition)
 	resp := new(roadshow.CalendarListResp)
 	total, err := roadshow.GetCalendarListCount(condition, pars, calendarType)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -2869,3 +2878,36 @@ func isSellerRole(roleType string) (ok bool) {
 	}
 	return
 }
+
+//func init() {
+//	init16_2()
+//}
+//
+//func init16_2() {
+//	listDate, err := roadshow.GetRsCalendarResearcherListInit16_2()
+//	if err != nil {
+//		fmt.Println(err)
+//		return
+//	}
+//
+//	for k, v := range listDate {
+//		fmt.Println(k, "__", v.CompanyId)
+//		//如果是权益客户，添加销售跟共享销售的信息
+//		var productItemRai *company.CompanyProduct
+//
+//		productItemRai, err = company.GetCompanyProductByCompanyIdAndProductId(v.CompanyId, utils.COMPANY_PRODUCT_RAI_ID)
+//		if err != nil && err.Error() != utils.ErrNoRow() {
+//			fmt.Println(err)
+//			return
+//		}
+//
+//		if productItemRai != nil {
+//			err = roadshow.UpdateRsCalendarSeller(productItemRai.SellerId, productItemRai.ShareSellerId, productItemRai.CompanyId)
+//			if err != nil && err.Error() != utils.ErrNoRow() {
+//				fmt.Println(err)
+//				return
+//			}
+//		}
+//	}
+//
+//}

models/roadshow/calendar.go

@@ -1003,3 +1003,18 @@ func GetOverseaCustomCalendarList2(sellerId, researcherId, startDate, endDate, c
 
 	return
 }
+
+func GetRsCalendarResearcherListInit16_2() (item []*RsCalendar, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM  rs_calendar WHERE activity_type = '路演' AND company_id > 0   GROUP BY company_id  `
+	_, err = o.Raw(sql).QueryRows(&item)
+	return
+}
+
+// 修改可见范围
+func UpdateRsCalendarSeller(seller_id, share_seller_id, company_id int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE rs_calendar SET seller_id=?, share_seller_id= ?   WHERE company_id =?  `
+	_, err = o.Raw(sql, seller_id, share_seller_id, company_id).Exec()
+	return
+}

models/system/sys_admin.go

@@ -470,11 +470,10 @@ func GetSysuserRaiList() (items []*AdminItem, err error) {
 		FROM
 			admin 
 		WHERE
-			role_type_code LIKE '%rai%' 
-			AND group_id NOT IN ( 19, 10, 17 ) 
+			role_type_code IN ('rai_group','rai_seller')
+			AND group_id NOT IN ( 19, 10, 17 )
 			AND enabled = 1 
-			OR real_name IN ( '沈涛', '张传星' )  
-			OR mobile IN ( '15011263967', '18935318900' , '15600639653', '18010097689', '13520990566') ` // 先写死，看情况要不要改
+			OR real_name IN ( '沈涛', '张传星' ) ` // 先写死，看情况要不要改
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }