Merge branch 'cygx/cygx_14-5' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -3428,7 +3428,7 @@ func (this *CompanyController) Detail() {
 			}
 
 			// CRM8.8-权益权限列表调用较多、统一进行调整
-			plist, e := services.RaiCompanyPermissionAndCheckList(companyId, isEdit, []string{"调研"})
+			plist, e := services.RaiCompanyPermissionAndCheckList(companyId, isEdit, utils.FilterPermissionNameRai)
 			if e != nil {
 				br.Msg = "获取客户权益权限列表信息失败"
 				br.ErrMsg = "获取客户权益权限列表信息失败，Err:" + e.Error()

controllers/company_permission.go

@@ -116,7 +116,7 @@ func (this *CompanyPermissionController) List() {
 			br.ErrMsg = "获取权限信息失败，Err:" + err.Error()
 			return
 		}
-		filterPermissionName := []string{"专家", "路演/专项点数", "海外调研"} // 需要过滤不展示的行业
+		filterPermissionName := utils.FilterPermissionNameRai // 需要过滤不展示的行业
 		if isShowYanXuanKouDian {
 			filterPermissionName = []string{"专家"} //申请转正，或者申请续约的时候 调研 行业需要进行展示
 		}

controllers/cygx/activity_special_trip.go

@@ -666,14 +666,14 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 
 	var condition string
 	var pars []interface{}
-	condition += " AND is_meeting = 1  AND  activity_id = ? "
-	pars = append(pars, activityId)
-	listOldMeetingDetail, err := cygx.GetCygxActivitySpecialMeetingDetailList(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "GetCygxActivitySpecialMeetingDetailList，Err:" + err.Error()
-		return
-	}
+	//condition += " AND is_meeting = 1  AND  activity_id = ? "
+	//pars = append(pars, activityId)
+	//listOldMeetingDetail, err := cygx.GetCygxActivitySpecialMeetingDetailList(condition, pars)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "GetCygxActivitySpecialMeetingDetailList，Err:" + err.Error()
+	//	return
+	//}
 	//获取之前已经到会的人
 	//var oldMeetingUserid = make(map[int]bool)
 
@@ -694,53 +694,53 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 
 	var items []*cygx.CygxActivitySpecialMeetingDetail
 	var itemsBill []*cygx.CygxActivitySpecialTripBill
-	if len(listOldMeetingDetail) > 0 {
-		for _, v := range listOldMeetingDetail {
-			if mapUserLastTripBill[v.UserId] == nil {
-				continue
-			}
-			//如果上一次空降的用户，这一次提交的时候没有带入，而且还被扣点了，那么就进行返点处理
-			if !newMeetingUserid[v.UserId] && v.IsAirborne == 1 && mapUserLastTripBill[v.UserId].BillDetailed < 0 {
-				var itemBill = new(cygx.CygxActivitySpecialTripBill)
-				//流水记录表
-				itemBill.UserId = v.UserId
-				itemBill.ActivityId = activityInfo.ActivityId
-				itemBill.CreateTime = time.Now()
-				itemBill.Mobile = v.Mobile
-				itemBill.Email = v.Email
-				itemBill.CompanyId = v.CompanyId
-				itemBill.CompanyName = v.CompanyName
-				itemBill.RealName = v.RealName
-				itemBill.Source = 2
-				itemBill.DoType = 2
-				itemBill.BillDetailed = 1 // 流水加一
-				itemBill.RegisterPlatform = 1
-				itemBill.ChartPermissionId = activityInfo.ChartPermissionId
-				itemBill.ChartPermissionName = activityInfo.ChartPermissionName
-				itemBill.AdminId = AdminUser.AdminId
-				itemBill.Way = 2
-				userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)
-				if err != nil {
-					br.Msg = "获取专项调研剩余次数失败"
-					br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
-					return
-				}
-				if userType == 2 {
-					//tripRemaining += itemBill.BillDetailed要处理
-					itemBill.Total = strconv.Itoa(tripRemaining) + "次"
-				} else {
-					for k, num := range mapChartName {
-						if activityInfo.ChartPermissionName == k {
-							//num += itemBill.BillDetailed要处理
-						}
-						itemBill.Total += k + strconv.Itoa(num) + "次+"
-					}
-					itemBill.Total = strings.TrimRight(itemBill.Total, "+")
-				}
-				itemsBill = append(itemsBill, itemBill)
-			}
-		}
-	}
+	//if len(listOldMeetingDetail) > 0 {
+	//	for _, v := range listOldMeetingDetail {
+	//		if mapUserLastTripBill[v.UserId] == nil {
+	//			continue
+	//		}
+	//		//如果上一次空降的用户，这一次提交的时候没有带入，而且还被扣点了，那么就进行返点处理
+	//		if !newMeetingUserid[v.UserId] && v.IsAirborne == 1 && mapUserLastTripBill[v.UserId].BillDetailed < 0 {
+	//			//var itemBill = new(cygx.CygxActivitySpecialTripBill)
+	//			//流水记录表
+	//			itemBill.UserId = v.UserId
+	//			itemBill.ActivityId = activityInfo.ActivityId
+	//			itemBill.CreateTime = time.Now()
+	//			itemBill.Mobile = v.Mobile
+	//			itemBill.Email = v.Email
+	//			itemBill.CompanyId = v.CompanyId
+	//			itemBill.CompanyName = v.CompanyName
+	//			itemBill.RealName = v.RealName
+	//			itemBill.Source = 2
+	//			itemBill.DoType = 2
+	//			itemBill.BillDetailed = 1 // 流水加一
+	//			itemBill.RegisterPlatform = 1
+	//			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+	//			itemBill.ChartPermissionName = activityInfo.ChartPermissionName
+	//			itemBill.AdminId = AdminUser.AdminId
+	//			itemBill.Way = 2
+	//			userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)
+	//			if err != nil {
+	//				br.Msg = "获取专项调研剩余次数失败"
+	//				br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
+	//				return
+	//			}
+	//			if userType == 2 {
+	//				//tripRemaining += itemBill.BillDetailed要处理
+	//				itemBill.Total = strconv.Itoa(tripRemaining) + "次"
+	//			} else {
+	//				for k, num := range mapChartName {
+	//					if activityInfo.ChartPermissionName == k {
+	//						//num += itemBill.BillDetailed要处理
+	//					}
+	//					itemBill.Total += k + strconv.Itoa(num) + "次+"
+	//				}
+	//				itemBill.Total = strings.TrimRight(itemBill.Total, "+")
+	//			}
+	//			itemsBill = append(itemsBill, itemBill)
+	//		}
+	//	}
+	//}
 
 	for _, v := range listUser {
 		var item = new(cygx.CygxActivitySpecialMeetingDetail)
@@ -757,46 +757,46 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 		if _, ok := UserMap[v.UserId]; !ok {
 			item.IsAirborne = 1
 		}
-		var itemBill = new(cygx.CygxActivitySpecialTripBill)
+		//var itemBill = new(cygx.CygxActivitySpecialTripBill)
 		//如果是空降客户,(没有扣点记录，或者上一次的流水不为负) 就进行扣点处理
-		if item.IsAirborne == 1 && (mapUserLastTripBill[v.UserId] == nil || mapUserLastTripBill[v.UserId].BillDetailed >= 0) {
-			//流水记录表
-			itemBill.UserId = v.UserId
-			itemBill.ActivityId = activityInfo.ActivityId
-			itemBill.CreateTime = time.Now()
-			itemBill.Mobile = v.Mobile
-			itemBill.Email = v.Email
-			itemBill.CompanyId = v.CompanyId
-			itemBill.CompanyName = v.CompanyName
-			itemBill.RealName = v.RealName
-			itemBill.Source = 2
-			itemBill.DoType = 1
-			itemBill.BillDetailed = -1 // 流水减一
-			itemBill.RegisterPlatform = 1
-			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
-			itemBill.ChartPermissionName = activityInfo.ChartPermissionName
-			itemBill.AdminId = AdminUser.AdminId
-			itemBill.Way = 2
-			userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)
-			if err != nil {
-				br.Msg = "获取专项调研剩余次数失败"
-				br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
-				return
-			}
-			if userType == 2 {
-				tripRemaining -= 1
-				itemBill.Total = strconv.Itoa(tripRemaining) + "次"
-			} else {
-				for k, num := range mapChartName {
-					if activityInfo.ChartPermissionName == k {
-						num -= 1
-					}
-					itemBill.Total += k + strconv.Itoa(num) + "次+"
-				}
-				itemBill.Total = strings.TrimRight(itemBill.Total, "+")
-			}
-			itemsBill = append(itemsBill, itemBill)
-		}
+		//if item.IsAirborne == 1 && (mapUserLastTripBill[v.UserId] == nil || mapUserLastTripBill[v.UserId].BillDetailed >= 0) {
+		//	//流水记录表
+		//	itemBill.UserId = v.UserId
+		//	itemBill.ActivityId = activityInfo.ActivityId
+		//	itemBill.CreateTime = time.Now()
+		//	itemBill.Mobile = v.Mobile
+		//	itemBill.Email = v.Email
+		//	itemBill.CompanyId = v.CompanyId
+		//	itemBill.CompanyName = v.CompanyName
+		//	itemBill.RealName = v.RealName
+		//	itemBill.Source = 2
+		//	itemBill.DoType = 1
+		//	itemBill.BillDetailed = -1 // 流水减一
+		//	itemBill.RegisterPlatform = 1
+		//	itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+		//	itemBill.ChartPermissionName = activityInfo.ChartPermissionName
+		//	itemBill.AdminId = AdminUser.AdminId
+		//	itemBill.Way = 2
+		//	userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)
+		//	if err != nil {
+		//		br.Msg = "获取专项调研剩余次数失败"
+		//		br.ErrMsg = "获取专项调研剩余次数失败,err:" + err.Error()
+		//		return
+		//	}
+		//	if userType == 2 {
+		//		tripRemaining -= 1
+		//		itemBill.Total = strconv.Itoa(tripRemaining) + "次"
+		//	} else {
+		//		for k, num := range mapChartName {
+		//			if activityInfo.ChartPermissionName == k {
+		//				num -= 1
+		//			}
+		//			itemBill.Total += k + strconv.Itoa(num) + "次+"
+		//		}
+		//		itemBill.Total = strings.TrimRight(itemBill.Total, "+")
+		//	}
+		//	itemsBill = append(itemsBill, itemBill)
+		//}
 		items = append(items, item)
 	}
 	err = cygx.MeetingDopecialMeet(meetingUids, noMeetingUids, activityId, items, itemsBill)
@@ -806,6 +806,7 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 		return
 	}
 	go cygxService.ActivitySpecialUserLabelLogAdd(activityId, userIdArr)
+	go cygxService.SpecialActivityPointsBillSubmitMeeting(activityId, AdminUser.AdminId)
 	//添加操作日志记录
 	br.Ret = 200
 	br.Success = true

services/cygx/activity_points_set.go

@@ -389,6 +389,26 @@ func ActivitySpecialCompanyApprovalRedis(comapnyId, companyContractId int) (err
 	return
 }
 
+// 12  专项调研活动到会研选扣点处理
+func SpecialActivityPointsBillSubmitMeeting(activityId, adminId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("activityId:", activityId)
+			go alarm_msg.SendAlarmMsg("专项调研活动到会研选扣点处理，写入Redis队列消息失败："+err.Error()+msg, 2)
+		}
+	}()
+	//SourceType int       `description:"1：报名、 2：取消报名、3：活动编辑、4：活动发布，取消发布、5：活动到会。6:研选审批通过的时候研选扣点更新、 7:正式专试用定时任务更新研选扣点"`
+	log := &cygx.YanXuanActivityPointsRedis{ActivityId: activityId, SourceType: 12, AdminId: adminId, Source: 2, CreateTime: time.Now()}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.CYGX_YANXUAN_POINTS_KEY, log)
+		if err != nil {
+			fmt.Println("YanXuanActivityPointsRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}
+
 func init0703() {
 	//2023.07.03剩余服务点数初始化
 	path := "0703.xlsx"

utils/constants.go

@@ -426,8 +426,11 @@ const (
 	HONG_GUAN_NAME                          string = "宏观"
 	CYGX_ARTICLE_TIME_LINE_KEY                     = "CYGX_ARTICLE_TIME_LINE_KEY" //产业时间线关联的文章key
 	WX_USER_RAI_LABEL_KEY                          = "CYGX_WX_USER_RAI_LABEL_KEY" //用户列表标签key
+
 )
 
+var FilterPermissionNameRai = []string{"专家", "路演/专项点数", "海外调研"} // 权益某些地方不展示的行业
+
 // GetRaiChartPermissionIdSpecialPoint 获取权益权限，专项路演调研权限ID
 func GetRaiChartPermissionIdSpecialPoint() (chartPermissionId int) {
 	if RunMode == "release" {