Merge branch 'crm/crm_17.0_ficc' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/company.go

@@ -14,6 +14,7 @@ import (
 	"hongze/hz_crm_api/models/company_user"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/response"
+	"hongze/hz_crm_api/models/roadshow"
 	statisticModels "hongze/hz_crm_api/models/statistic_report"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/services"
@@ -9083,7 +9084,7 @@ func (this *CompanyController) RoadShowList() {
 		englishCompany = 1
 	}
 	var err error
-	roadShowList, err := company.GetRoadShowList(companyIdInt, englishCompany)
+	roadShowList, err := company.GetRoadShowListNuion(companyIdInt, englishCompany)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -9100,28 +9101,59 @@ func (this *CompanyController) RoadShowList() {
 	//	roadShowTotalMap[roadShowTotal.CompanyId] = roadShowTotal.Total
 	//}
 
+	//获取活动下关联的多个销售信息
+	var rsActivityIds []int
+	for _, v := range roadShowList {
+		if v.RsType == 2 {
+			rsActivityIds = append(rsActivityIds, v.RsCalendarId)
+		}
+	}
+	mapSeller := make(map[int][]string)
+	if len(rsActivityIds) > 0 {
+		//获取对应的多个销售信息
+		listSeller, err := roadshow.GetRsActivitySellerListByActivityIds(rsActivityIds)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+			return
+		}
+		for _, v := range listSeller {
+			mapSeller[v.RsActivityId] = append(mapSeller[v.RsActivityId], v.SellerName)
+		}
+	}
+
 	resp := make([]company.RoadShowListResp, len(roadShowList))
 	for i, calendar := range roadShowList {
 		resp[i].SysUserRealName = calendar.SysUserRealName
-		resp[i].RoadshowType = calendar.RoadshowType
-		//线上为平台，线下为省市
-		if calendar.RoadshowType == "线上" {
-			resp[i].RoadshowPlatform = calendar.RoadshowPlatform
+
+		if calendar.RsType == 1 {
+			resp[i].RoadshowType = calendar.RoadshowType
+			//线上为平台，线下为省市
+			if calendar.RoadshowType == "线上" {
+				resp[i].RoadshowPlatform = calendar.RoadshowPlatform
+			} else {
+				resp[i].RoadshowPlatform = calendar.Province + calendar.City
+			}
+			researchers, err := company.GetRoadShowResearchers(calendar.RsCalendarId)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				br.Msg = "获取研究员信息失败"
+				br.ErrMsg = "获取研究员信息失败,Err:" + err.Error()
+				return
+			}
+			var researcherList []string
+			for _, researcher := range researchers {
+				researcherList = append(researcherList, *researcher)
+			}
+			researcher := strings.Join(researcherList, ",")
+			resp[i].Researchers = researcher
 		} else {
-			resp[i].RoadshowPlatform = calendar.Province + calendar.City
-		}
-		researchers, err := company.GetRoadShowResearchers(calendar.RsCalendarId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取研究员信息失败"
-			br.ErrMsg = "获取研究员信息失败,Err:" + err.Error()
-			return
-		}
-		var researcherList []string
-		for _, researcher := range researchers {
-			researcherList = append(researcherList, *researcher)
+			resp[i].RoadshowType = "线下"
+			if calendar.RoadshowPlatform == "" {
+				resp[i].RoadshowPlatform = "--"
+			}
+			researcher := strings.Join(mapSeller[calendar.RsCalendarId], ",")
+			resp[i].Researchers = researcher
 		}
-		researcher := strings.Join(researcherList, ",")
-		resp[i].Researchers = researcher
 		resp[i].RoadShowTime = calendar.EndDate.Format("2006.01.02")
 	}
 

controllers/company_seller.go

@@ -7600,3 +7600,110 @@ func (this *CompanySellerController) CheckListRaiServerType() {
 		ListServer: listServer,
 	}
 }
+
+// ActivityFiccList
+// @Title 活动FICC销售列表
+// @Description 活动FICC销售列表
+// @Success 200 {object} system.RoadshowGroupResp
+// @router /seller/activity_ficc/list [get]
+func (this *CompanySellerController) ActivityFiccList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	resp := new(system.RoadshowGroupResp)
+	productId := services.GetProductId(sysUser.RoleTypeCode)
+	if productId == utils.COMPANY_PRODUCT_RAI_ID {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
+	// 分组
+	departmentId := 2
+	groups, e := system.GetGroupByDepartmentId(departmentId)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取FICC分组失败, Err: " + e.Error()
+		return
+	}
+	teamGroupId := make(map[int]int, 0) // 小组ID对应的大组ID
+	var list []system.RoadshowGroups
+	for _, g := range groups {
+		if g.ParentId > 0 {
+			teamGroupId[g.GroupId] = g.ParentId
+			continue
+		}
+		if strings.Contains(g.GroupName, "离职") {
+			continue
+		}
+
+		// 大组
+		list = append(list, system.RoadshowGroups{
+			GroupId:   g.GroupId,
+			GroupName: g.GroupName,
+		})
+	}
+
+	// 销售
+	roleArr := []string{
+		utils.ROLE_TYPE_CODE_FICC_ADMIN, utils.ROLE_TYPE_CODE_FICC_DEPARTMENT, utils.ROLE_TYPE_CODE_FICC_GROUP,
+		utils.ROLE_TYPE_CODE_FICC_TEAM, utils.ROLE_TYPE_CODE_FICC_SELLER,
+	}
+	cond := fmt.Sprintf(` AND role_type_code IN (%s) AND enabled = 1 `, utils.GetOrmInReplace(len(roleArr)))
+	pars := make([]interface{}, 0)
+	pars = append(pars, roleArr)
+	sellers, e := system.GetSysUserItemsOrderByCreated(cond, pars)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取FICC销售失败, Err: " + e.Error()
+		return
+	}
+
+	groupIdChild := make(map[int][]system.RoadshowGroupSellers) // 大组ID对应的销售
+	for _, s := range sellers {
+		var seller system.RoadshowGroupSellers
+		seller.AdminId = s.AdminId
+		seller.AdminName = s.RealName
+
+		gid := teamGroupId[s.GroupId]
+		if gid > 0 {
+			// 小组
+			seller.GroupId = gid
+			seller.TeamId = s.GroupId
+		} else {
+			// 大组
+			seller.GroupId = s.GroupId
+		}
+		groupIdChild[seller.GroupId] = append(groupIdChild[seller.GroupId], seller)
+	}
+
+	// 根据当前角色过滤可选项
+
+	for _, v := range list {
+		child := groupIdChild[v.GroupId]
+
+		// 非以上两种情况, 可见该大组所有销售
+		v.Child = child
+		resp.List = append(resp.List, v)
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

controllers/roadshow/activity.go

@@ -0,0 +1,367 @@
+package roadshow
+
+import (
+	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/controllers"
+	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/roadshow"
+	"hongze/hz_crm_api/models/system"
+	"hongze/hz_crm_api/services"
+	roadshowService "hongze/hz_crm_api/services/roadshow"
+	"hongze/hz_crm_api/utils"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// 日历
+type ActivityController struct {
+	controllers.BaseAuthController
+}
+
+// @Title 新增路演活动接口
+// @Description 新增路演活动接口
+// @Param	request	body roadshow.AddActivityReq true "type json string"
+// @Success Ret=200 保存成功
+// @router /add [post]
+func (this *ActivityController) Add() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	deleteCache := true
+	cacheKey := "CACHE_RS_ACTIVITY_ADD_SELLER_" + strconv.Itoa(sysUser.AdminId)
+	defer func() {
+		if deleteCache {
+			utils.Rc.Delete(cacheKey)
+		}
+	}()
+	if !utils.Rc.SetNX(cacheKey, 1, 5*time.Second) {
+		deleteCache = false
+		br.Msg = "系统处理中，请稍后重试！"
+		br.ErrMsg = "系统处理中，请稍后重试！" + sysUser.RealName + ";data:" + string(this.Ctx.Input.RequestBody)
+		return
+	}
+	var req roadshow.AddActivitySellerReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if len(req.SellerId) <= 0 {
+		br.Msg = "请选择销售！"
+		return
+	}
+
+	var checkIsAdd []string
+
+	if req.SellerName == "" {
+		br.Msg = "请选择销售！"
+		return
+	}
+	if req.StartDate == "" {
+		br.Msg = "请选择开始日期！"
+		return
+	}
+	if req.EndDate == "" {
+		br.Msg = "请选择结束日期！"
+		return
+	}
+	if req.StartTime == "" {
+		br.Msg = "请选择开始时间！"
+		return
+	}
+	if req.EndTime == "" {
+		br.Msg = "请选择结束时间！"
+		return
+	}
+	if req.StartWeek == "" {
+		br.Msg = "请选择周！"
+		return
+	}
+
+	if req.EndWeek == "" {
+		br.Msg = "请选择周！"
+		return
+	}
+
+	startDateTime := req.StartDate + " " + req.StartTime
+	endDateTime := req.EndDate + " " + req.EndTime
+
+	startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
+	endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
+
+	if endP.Before(startP) {
+		br.Msg = "结束时间不得早于开始时间！"
+		return
+	}
+
+	sellerList, err := system.GetSysAdminByIds(req.SellerId)
+	if err != nil {
+		br.Msg = "保存失败！"
+		br.ErrMsg = "获取销售信息失败！Err:" + err.Error()
+		return
+	}
+	for _, v := range sellerList {
+		//校验销售活动时间冲突
+		{
+			activityCount, err := roadshowService.CheckActivity(startDateTime, endDateTime, "1,2", v.AdminId)
+			if err != nil {
+				br.Msg = "时间冲突检测失败！"
+				br.ErrMsg = "时间冲突检测失败-CheckCalendarSellerCount！Err:" + err.Error()
+				return
+			}
+			if activityCount > 0 && !utils.InArrayByStr(checkIsAdd, v.RealName) {
+				checkIsAdd = append(checkIsAdd, v.RealName)
+			}
+		}
+
+		//校验活动时间冲突
+		{
+			activityResearcherCount, err := roadshowService.CheckResearcherBySysSserId(startDateTime, endDateTime, "1,2", v.AdminId)
+			if err != nil {
+				br.Msg = "时间冲突检测失败！"
+				br.ErrMsg = "时间冲突检测失败-CheckCalendarSellerCount！Err:" + err.Error()
+				return
+			}
+			if activityResearcherCount > 0 && !utils.InArrayByStr(checkIsAdd, v.RealName) {
+				checkIsAdd = append(checkIsAdd, v.RealName)
+			}
+		}
+
+		//校验事项时间冲突
+		{
+			matterCount, err := roadshowService.CheckMatters(startDateTime, endDateTime, v.AdminId, 0)
+			if err != nil {
+				br.Msg = "时间冲突检测失败！"
+				br.ErrMsg = "时间冲突检测失败-CheckCalendarActivitySellerrCount！Err:" + err.Error()
+				return
+			}
+			if matterCount > 0 && !utils.InArrayByStr(checkIsAdd, v.RealName) {
+				checkIsAdd = append(checkIsAdd, v.RealName)
+			}
+		}
+
+	}
+
+	if len(checkIsAdd) > 0 {
+		br.Msg = strings.Join(checkIsAdd, ",") + " 时间已被占用！"
+		br.ErrMsg = "时间冲突检测失败-CheckMattersCount！"
+		br.IsSendEmail = false
+		return
+	}
+
+	rsActivity := new(roadshow.RsActivity)
+	rsActivity.SysUserId = sysUser.AdminId
+	rsActivity.SysUserRealName = sysUser.RealName
+	rsActivity.ActivityType = req.ActivityType
+	rsActivity.CompanyId = req.CompanyId
+	rsActivity.CompanyName = req.CompanyName
+	rsActivity.Theme = req.Theme
+	rsActivity.CreateTime = time.Now()
+	rsActivity.ModifyTime = time.Now()
+
+	rsActivity.EnglishCompany = req.EnglishCompany
+	rsActivityId, err := roadshow.AddRsActivity(rsActivity)
+	if err != nil {
+		br.Msg = "保存失败！"
+		br.ErrMsg = "保存日历活动信息失败！Err:" + err.Error()
+		return
+	}
+
+	for _, v := range sellerList {
+		researcher := new(roadshow.RsActivitySeller)
+		researcher.RsActivityId = int(rsActivityId)
+		researcher.SellerId = v.AdminId
+		researcher.SellerName = v.RealName
+		researcher.StartDate = req.StartDate
+		researcher.EndDate = req.EndDate
+		researcher.StartTime = req.StartTime
+		researcher.EndTime = req.EndTime
+		researcher.StartWeek = req.StartWeek
+		researcher.EndWeek = req.EndWeek
+		researcher.CreateTime = time.Now()
+		researcher.ModifyTime = time.Now()
+		researcher.Status = 2
+		_, err = roadshow.AddRsActivitySeller(researcher)
+		if err != nil {
+			br.Msg = "保存失败！"
+			br.ErrMsg = "保存日历活动-销售路演信息失败！Err:" + err.Error()
+			return
+		}
+	}
+	openIdList := make([]*system.OpenIdList, 0)
+	sysAdmin, _ := system.GetSysAdminById(sysUser.AdminId)
+	if sysAdmin != nil && sysAdmin.OpenId != "" {
+		openIdObj := &system.OpenIdList{
+			OpenId:  sysAdmin.OpenId,
+			AdminId: sysAdmin.AdminId,
+		}
+		openIdList = append(openIdList, openIdObj)
+	}
+	go services.SendWxMsgWithRoadshowSellerActivity(req.CompanyName, rsActivity.ActivityType, "已添加", time.Now().Format(utils.FormatDateTime), openIdList, int(rsActivityId))
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "保存成功"
+	br.IsAddLog = true
+}
+
+// 活动列表
+// @Title 活动列表
+
+// @Description 活动列表接口
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Success 200 {object} roadshow.ResearcherGroup
+// @router /list2 [get]
+func (this *ActivityController) List() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	var total int
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize10
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = paging.StartIndex(currentIndex, pageSize)
+
+	var resp roadshow.RsActivitySellerListResp
+
+	var condition string
+	var pars []interface{}
+	condition = " AND b.sys_user_id = ?  AND a.status = 2  "
+	pars = append(pars, sysUser.AdminId)
+
+	total, err := roadshow.GetRsActivitySellerListCount(condition, pars)
+	if err != nil {
+		br.Msg = "获取失败！"
+		br.ErrMsg = "获取数量失败！Err:" + err.Error()
+		return
+	}
+	page := paging.GetPaging(currentIndex, pageSize, total)
+
+	dataList, err := roadshow.GetRsActivitySellerList(condition, pars, startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+		return
+	}
+	var rsActivityIds []int
+	for _, v := range dataList {
+		rsActivityIds = append(rsActivityIds, v.RsActivityId)
+	}
+	//获取对应的多个销售信息
+	listSeller, err := roadshow.GetRsActivitySellerListByActivityIds(rsActivityIds)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+		return
+	}
+	mapSeller := make(map[int][]string)
+	for _, v := range listSeller {
+		mapSeller[v.RsActivityId] = append(mapSeller[v.RsActivityId], v.SellerName)
+	}
+	for _, v := range dataList {
+		v.SellerName = strings.Join(mapSeller[v.RsActivityId], ",")
+	}
+
+	resp.Paging = page
+	resp.List = dataList
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// @Title 删除路演活动接口
+// @Description 删除路演活动接口
+// @Param	request	body roadshow.AddActivityReq true "type json string"
+// @Success Ret=200 保存成功
+// @router /delete [post]
+func (this *ActivityController) Delete() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	var req roadshow.RsActivityIdReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	rsActivityId := req.RsActivityId
+
+	detail, err := roadshow.GetRsActivityByRsActivityId(rsActivityId)
+	if err != nil {
+		br.Msg = "删除失败"
+		br.ErrMsg = "获取信息失败,GetRsActivityByRsActivityId,Err:" + err.Error()
+		return
+	}
+
+	if detail.SysUserId != sysUser.AdminId {
+		br.Msg = "删除失败"
+		br.ErrMsg = "删除失败,不是自己创建的活动信息"
+		return
+	}
+
+	err = roadshow.DeleteRsActivitySeller(rsActivityId)
+	if err != nil {
+		br.Msg = "删除失败"
+		br.ErrMsg = "删除失败,DeleteRsActivitySeller,Err:" + err.Error()
+		return
+	}
+	openIdList := make([]*system.OpenIdList, 0)
+	sysAdmin, _ := system.GetSysAdminById(sysUser.AdminId)
+	if sysAdmin != nil && sysAdmin.OpenId != "" {
+		openIdObj := &system.OpenIdList{
+			OpenId:  sysAdmin.OpenId,
+			AdminId: sysAdmin.AdminId,
+		}
+		openIdList = append(openIdList, openIdObj)
+	}
+	go services.SendWxMsgWithRoadshowSellerActivity(detail.CompanyName, detail.ActivityType, "已删除", time.Now().Format(utils.FormatDateTime), openIdList, rsActivityId)
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "删除成功"
+	br.IsAddLog = true
+}

controllers/roadshow/calendar.go

@@ -198,6 +198,19 @@ func (this *CalendarController) Add() {
 				checkIsAdd = append(checkIsAdd, v.ResearcherName)
 			}
 		}
+
+		//校验销售活动时间冲突
+		{
+			activityCount, err := roadshowService.CheckActivity(startDateTime, endDateTime, "1,2", sysUser.AdminId)
+			if err != nil {
+				br.Msg = "时间冲突检测失败！"
+				br.ErrMsg = "时间冲突检测失败-CheckCalendarActivitySellerrCount！Err:" + err.Error()
+				return
+			}
+			if activityCount > 0 {
+				checkIsAdd = append(checkIsAdd, sysUser.RealName)
+			}
+		}
 	}
 
 	if len(checkIsAdd) > 0 {
@@ -575,6 +588,19 @@ func (this *CalendarController) Edit() {
 		if calendarCount > 0 {
 			checkIsAdd = append(checkIsAdd, v.ResearcherName)
 		}
+
+		//校验销售活动时间冲突
+		{
+			activityCount, err := roadshowService.CheckActivity(startDateTime, endDateTime, "1,2", sysUser.AdminId)
+			if err != nil {
+				br.Msg = "时间冲突检测失败！"
+				br.ErrMsg = "时间冲突检测失败-CheckCalendarActivitySellerrCount！Err:" + err.Error()
+				return
+			}
+			if activityCount > 0 {
+				checkIsAdd = append(checkIsAdd, sysUser.RealName)
+			}
+		}
 	}
 
 	if len(checkIsAdd) > 0 {
@@ -1237,7 +1263,7 @@ func (this *CalendarController) CalendarList() {
 		br.Ret = 408
 		return
 	}
-
+	resp := new(roadshow.CalendarListResp)
 	calendarType, _ := this.GetInt("CalendarType")
 
 	pageSize, _ := this.GetInt("PageSize")
@@ -1263,6 +1289,73 @@ func (this *CalendarController) CalendarList() {
 	var condition string
 	var pars []interface{}
 
+	if calendarType == 6 { // 兼容前端 单独走一条逻辑
+		condition = " AND b.sys_user_id = ?  AND a.status = 2  "
+		pars = append(pars, sysUser.AdminId)
+
+		total, err := roadshow.GetRsActivitySellerListCount(condition, pars)
+		if err != nil {
+			br.Msg = "获取失败！"
+			br.ErrMsg = "获取数量失败！Err:" + err.Error()
+			return
+		}
+		page = paging.GetPaging(currentIndex, pageSize, total)
+
+		dataList, err := roadshow.GetRsActivitySellerList(condition, pars, startSize, pageSize)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+			return
+		}
+		if len(dataList) > 0 {
+			var rsActivityIds []int
+			for _, v := range dataList {
+				rsActivityIds = append(rsActivityIds, v.RsActivityId)
+			}
+			//获取对应的多个销售信息
+			listSeller, err := roadshow.GetRsActivitySellerListByActivityIds(rsActivityIds)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取数据失败,GetRsActivitySellerList,Err:" + err.Error()
+				return
+			}
+			mapSeller := make(map[int][]string)
+			for _, v := range listSeller {
+				mapSeller[v.RsActivityId] = append(mapSeller[v.RsActivityId], v.SellerName)
+			}
+			for _, v := range dataList {
+				v.SellerName = strings.Join(mapSeller[v.RsActivityId], ",")
+				item := new(roadshow.CalendarListView)
+				item.Status = 2
+				item.CompanyId = v.CompanyId
+				item.CompanyName = v.CompanyName
+				item.RsActivityId = v.RsActivityId
+				item.ActivityType = v.ActivityType
+				item.ResearcherName = v.SellerName
+				item.StartDate = v.StartDate
+				item.EndDate = v.EndDate
+				item.StartTime = v.StartTime
+				item.EndTime = v.EndTime
+				item.StartWeek = v.StartWeek
+				item.EndWeek = v.EndWeek
+				item.Theme = v.Theme
+				item.CreateTime = v.CreateTime
+				item.SysUserRealName = v.SysUserRealName
+				item.EnglishCompany = v.EnglishCompany
+				resp.List = append(resp.List, item)
+			}
+		} else {
+			resp.List = make([]*roadshow.CalendarListView, 0)
+		}
+
+		resp.Paging = page
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
+
 	roleTypeCode := sysUser.RoleTypeCode
 	//销售
 	if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_SELLER ||
@@ -1348,7 +1441,7 @@ func (this *CalendarController) CalendarList() {
 	}
 
 	fmt.Println(condition)
-	resp := new(roadshow.CalendarListResp)
+
 	total, err := roadshow.GetCalendarListCount(condition, pars, calendarType)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
@@ -2065,6 +2158,22 @@ func (this *CalendarController) MattersAdd() {
 		}
 	}
 
+	//校验销售活动时间冲突
+	{
+		activityCount, err := roadshowService.CheckActivity(startDateTime, endDateTime, "1,2", sysUser.AdminId)
+		if err != nil {
+			br.Msg = "时间冲突检测失败！"
+			br.ErrMsg = "时间冲突检测失败-CheckCalendar！Err:" + err.Error()
+			return
+		}
+		if activityCount > 0 {
+			br.Msg = "当前时间已被占用！"
+			br.ErrMsg = "时间冲突检测失败-CheckCalendarActivitySellerrCount！"
+			br.IsSendEmail = false
+			return
+		}
+	}
+
 	startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
 	endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
 
@@ -2306,6 +2415,21 @@ func (this *CalendarController) MattersUpdate() {
 			}
 		}
 	}
+	//校验销售活动时间冲突
+	{
+		activityCount, err := roadshowService.CheckActivity(startDateTime, endDateTime, "1,2", sysUser.AdminId)
+		if err != nil {
+			br.Msg = "时间冲突检测失败！"
+			br.ErrMsg = "时间冲突检测失败-CheckCalendar！Err:" + err.Error()
+			return
+		}
+		if activityCount > 0 {
+			br.Msg = "当前时间已被占用！"
+			br.ErrMsg = "时间冲突检测失败-CheckCalendarActivitySellerrCount！"
+			br.IsSendEmail = false
+			return
+		}
+	}
 
 	whereParams := make(map[string]interface{})
 
@@ -2712,9 +2836,24 @@ func (this *CalendarController) MyCalendarDetail() {
 		return
 	}
 
+	// 活动
+	condition = ` AND a.seller_id  IN (?) AND a.start_date >= ? AND a.end_date <= ? AND a.status = 2 `
+	pars = make([]interface{}, 0)
+	pars = append(pars, sysUser.AdminId, startDate, endDate)
+	sellerList, err := roadshow.GetRsActivitySellerList2(condition, pars)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "获取数据失败，GetCalendarDetailList Err:" + err.Error()
+		return
+	}
+	if sellerList == nil {
+		sellerList = make([]*roadshow.RsActivitySellerResp, 0)
+	}
+
 	resp := new(roadshow.CalendarDetailResp)
 	resp.CalendarList = calendarList
 	resp.RsMattersList = matterList
+	resp.RsSellerList = sellerList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
@@ -2970,17 +3109,19 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 	startDate := this.GetString("StartDate")
 	endDate := this.GetString("EndDate")
-	sellerId, _ := this.GetInt("SellerId")
+	sellerId := this.GetString("SellerId")
 	if startDate == "" || endDate == "" {
 		br.Msg = "参数错误"
 		return
 	}
-	if sellerId <= 0 {
+	if sellerId == "" {
 		calendarList := make([]*roadshow.CalendarListView, 0)
 		matterList := make([]*roadshow.RsMatters, 0)
+		sellerList := make([]*roadshow.RsActivitySellerResp, 0)
 		resp := new(roadshow.CalendarDetailResp)
 		resp.CalendarList = calendarList
 		resp.RsMattersList = matterList
+		resp.RsSellerList = sellerList
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
@@ -2989,7 +3130,7 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 
 	// 路演
-	condition := ` AND a.sys_user_id = ? AND b.start_date >= ? AND b.end_date <= ? AND b.status = 2`
+	condition := ` AND a.sys_user_id IN (?) AND b.start_date >= ? AND b.end_date <= ? AND b.status = 2`
 	pars := make([]interface{}, 0)
 	pars = append(pars, sellerId, startDate, endDate)
 	calendarList, err := roadshow.GetCalendarDetailList(condition, pars)
@@ -3003,7 +3144,7 @@ func (this *CalendarController) SellerCalendarDetail() {
 	}
 
 	// 事项
-	matterList, err := roadshow.GetRsMattersList(startDate, endDate, sellerId)
+	matterList, err := roadshow.GetRsMattersListBySysUserId(startDate, endDate, sellerId)
 	if err != nil {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "获取数据失败，GetRsMattersList Err:" + err.Error()
@@ -3013,9 +3154,24 @@ func (this *CalendarController) SellerCalendarDetail() {
 		matterList = make([]*roadshow.RsMatters, 0)
 	}
 
+	// 活动
+	condition = ` AND a.seller_id  IN (?) AND a.start_date >= ? AND a.end_date <= ? AND a.status = 2 `
+	pars = make([]interface{}, 0)
+	pars = append(pars, sellerId, startDate, endDate)
+	sellerList, err := roadshow.GetRsActivitySellerList2(condition, pars)
+	if err != nil {
+		br.Msg = "获取数据失败"
+		br.ErrMsg = "获取数据失败，GetCalendarDetailList Err:" + err.Error()
+		return
+	}
+	if sellerList == nil {
+		sellerList = make([]*roadshow.RsActivitySellerResp, 0)
+	}
+
 	resp := new(roadshow.CalendarDetailResp)
 	resp.CalendarList = calendarList
 	resp.RsMattersList = matterList
+	resp.RsSellerList = sellerList
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/company/company.go

@@ -1675,6 +1675,7 @@ type RoadShowCalendar struct {
 	ActivityCategory string `description:"活动类别"`
 	IsSynced         int    `description:"是否与上海同步 0:未同步 1:已同步"`
 	EndDate          time.Time
+	RsType           int `description:"路演身份类型，1研究员，2销售"`
 }
 
 func GetRoadShowList(companyId, englishCompany int) (items []*RoadShowCalendar, err error) {
@@ -1694,6 +1695,55 @@ WHERE
 	_, err = o.Raw(sql, companyId, englishCompany).QueryRows(&items)
 	return
 }
+func GetRoadShowListNuion(companyId, englishCompany int) (items []*RoadShowCalendar, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			a.rs_calendar_id,
+			a.roadshow_type,
+			a.roadshow_platform,
+			a.sys_user_real_name,
+			a.province,
+			a.city,
+			b.end_date,
+			a.create_time,
+			1 as rs_type
+		FROM
+			rs_calendar AS a
+			INNER JOIN rs_calendar_researcher AS b ON a.rs_calendar_id = b.rs_calendar_id 
+		WHERE
+			a.source = 0 
+			AND a.company_id = ?  
+			AND b.STATUS = 2 
+			AND a.english_company =?  
+			AND NOW()> DATE_FORMAT( CONCAT( end_date, " ", end_time ), '%Y-%m-%d %H:%i:%S' ) 
+		GROUP BY
+			rs_calendar_id UNION ALL
+		SELECT
+			a.rs_activity_id AS rs_calendar_id,
+			a.roadshow_type,
+			a.roadshow_platform,
+			a.sys_user_real_name,
+			'' AS province,
+			'' AS city,
+			b.end_date,
+			a.create_time,
+			2 as rs_type
+		FROM
+			rs_activity AS a
+			INNER JOIN rs_activity_seller AS b ON a.rs_activity_id = b.rs_activity_id 
+		WHERE
+			1 = 1 
+			AND a.company_id = ? 
+			AND b.STATUS = 2 
+			AND a.english_company =? 
+			AND NOW()> DATE_FORMAT( CONCAT( end_date, " ", end_time ), '%Y-%m-%d %H:%i:%S' ) 
+		GROUP BY
+			a.rs_activity_id 
+		ORDER BY
+	create_time DESC `
+	_, err = o.Raw(sql, companyId, englishCompany, companyId, englishCompany).QueryRows(&items)
+	return
+}
 
 type RoadShowListResp struct {
 	SysUserRealName  string `description:"对接销售"`

models/db.go

@@ -391,6 +391,8 @@ func initRoadShow() {
 		new(roadshow.RsCalendarApiLog),            //上海路演三方接口请求记录日志表
 		new(roadshow.RsReportRecordPermission),    //路演公司权限记录
 		new(roadshow.RsCalendarResearcherQuestion),
+		new(roadshow.RsActivity),       // 销售预约活动主表
+		new(roadshow.RsActivitySeller), //销售与活动关系表
 	)
 }
 

models/roadshow/activity.go

@@ -0,0 +1,219 @@
+package roadshow
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hz_crm_api/utils"
+	"time"
+)
+
+type AddActivitySellerReq struct {
+	ActivityType     string `description:"活动类型"`
+	RoadshowType     string `description:"路演形式"`
+	RoadshowPlatform string `description:"路演平台"`
+	CompanyId        int    `description:"客户id"`
+	CompanyName      string `description:"客户名称"`
+	Theme            string `description:"会议主题"`
+	CooperationName  string `description:"合作方名称"`
+	ActivityCategory string `description:"活动类别"`
+	//SellerList       []*ActivitySellerReq
+	EnglishCompany int    `description:"是否为英文客户"`
+	SellerId       string `description:"销售id，多个用 ,隔开"`
+	SellerName     string `description:"销售名称"`
+	StartDate      string `description:"开始日期"`
+	EndDate        string `description:"结束日期"`
+	StartTime      string `description:"开始时间"`
+	EndTime        string `description:"结束时间"`
+	StartWeek      string `description:"开始日期对应周"`
+	EndWeek        string `description:"结束日期对应周"`
+}
+
+type RsActivityIdReq struct {
+	RsActivityId int `description:"活动id"`
+}
+
+type ActivitySellerReq struct {
+	SellerId   int    `description:"销售id"`
+	SellerName string `description:"销售名称"`
+	StartDate  string `description:"开始日期"`
+	EndDate    string `description:"结束日期"`
+	StartTime  string `description:"开始时间"`
+	EndTime    string `description:"结束时间"`
+	StartWeek  string `description:"开始日期对应周"`
+	EndWeek    string `description:"结束日期对应周"`
+}
+
+type RsActivity struct {
+	RsActivityId    int    `orm:"column(rs_activity_id);pk"`
+	SysUserId       int    `description:"创建人id"`
+	SysUserRealName string `description:"创建人名称"`
+	ActivityType    string `description:"活动类型"`
+	CompanyId       int    `description:"客户id"`
+	CompanyName     string `description:"客户名称"`
+	Theme           string `description:"会议主题"`
+	CreateTime      time.Time
+	ModifyTime      time.Time
+	EnglishCompany  int `description:"是否为英文客户: 0-否; 1-是"`
+}
+
+// 添加RsActivity
+func AddRsActivity(item *RsActivity) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+type RsActivitySeller struct {
+	RsActivitySellerId int    `orm:"column(rs_activity_seller_id);pk"`
+	RsActivityId       int    `description:"活动id"`
+	SellerId           int    `description:"销售id"`
+	SellerName         string `description:"销售id"`
+	StartDate          string `description:"开始日期"`
+	EndDate            string `description:"结束日期"`
+	StartTime          string `description:"开始时间"`
+	EndTime            string `description:"结束时间"`
+	StartWeek          string `description:"开始日期对应周"`
+	EndWeek            string `description:"结束日期对应周"`
+	CreateTime         time.Time
+	ModifyTime         time.Time
+	Status             int       `description:"状态:1:待接受,2:已接受,3:已拒绝,4:已删除,5:已撤回,6:已结束"`
+	DeleteReason       string    `description:"删除理由"`
+	DeleteTime         time.Time `description:"删除时间"`
+}
+
+// 添加 RsActivitySeller
+func AddRsActivitySeller(item *RsActivitySeller) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}
+
+type RsActivitySellerResp struct {
+	RsActivitySellerId int    `orm:"column(rs_activity_seller_id);pk"`
+	CompanyId          int    `description:"客户id"`
+	CompanyName        string `description:"客户名称"`
+	RsActivityId       int    `description:"活动id"`
+	ActivityType       string `description:"活动类型"`
+	SellerName         string `description:"销售姓名"`
+	StartDate          string `description:"开始日期"`
+	EndDate            string `description:"结束日期"`
+	StartTime          string `description:"开始时间"`
+	EndTime            string `description:"结束时间"`
+	StartWeek          string `description:"开始日期对应周"`
+	EndWeek            string `description:"结束日期对应周"`
+	Theme              string `description:"会议主题"`
+	CreateTime         string `description:"创建时间"`
+	SysUserRealName    string `description:"创建人名称"`
+	RoadshowType       string `description:"路演形式"`
+	EnglishCompany     int    `description:"是否为英文客户: 0-否; 1-是"`
+}
+
+type RsActivitySellerListResp struct {
+	Paging *paging.PagingItem
+	List   []*RsActivitySellerResp
+}
+
+func GetRsActivitySellerList(condition string, pars []interface{}, startSize, pageSize int) (items []*RsActivitySellerResp, err error) {
+	sql := `SELECT
+			a.*,
+			b.sys_user_real_name,
+			b.theme,
+			b.activity_type,
+			b.company_id,
+			b.english_company,
+			b.company_name 
+		FROM
+			rs_activity_seller AS a
+			INNER JOIN rs_activity AS b ON a.rs_activity_id = b.rs_activity_id 
+		WHERE
+			1 = 1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` GROUP BY a.rs_activity_id  ORDER BY b.create_time DESC LIMIT ?,? `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+func GetRsActivitySellerList2(condition string, pars []interface{}) (list []*RsActivitySellerResp, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			a.*,
+			b.sys_user_real_name,
+			b.theme,
+			b.activity_type,
+			b.company_id,
+			b.company_name 
+		FROM
+			rs_activity_seller AS a
+			INNER JOIN rs_activity AS b ON a.rs_activity_id = b.rs_activity_id 
+		WHERE
+			1 = 1`
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` ORDER BY a.create_time DESC `
+	_, err = o.Raw(sql, pars).QueryRows(&list)
+	return
+}
+
+// 根据活动ID获取销售列表
+func GetRsActivitySellerListByActivityIds(rsActivityIds []int) (items []*RsActivitySeller, err error) {
+	lenArr := len(rsActivityIds)
+	if lenArr == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	sql := `SELECT
+			 * 
+		FROM
+			rs_activity_seller AS a
+		WHERE
+			1 = 1  AND  rs_activity_id IN (` + utils.GetOrmInReplace(lenArr) + `) `
+	_, err = o.Raw(sql, rsActivityIds).QueryRows(&items)
+	return
+}
+
+func GetRsActivitySellerListCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT
+			COUNT( * )  as  count   
+		FROM
+			(
+			SELECT
+				COUNT( * ) 
+			FROM
+				rs_activity AS b
+				INNER JOIN rs_activity_seller AS a ON a.rs_activity_id = b.rs_activity_id 
+			WHERE
+				1 = 1  ` + condition + ` GROUP BY a.rs_activity_id ) b  `
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
+// 删除
+func DeleteRsActivitySeller(rsActivityId int) (err error) {
+	o := orm.NewOrm()
+	sql := ` UPDATE rs_activity_seller SET status=4   WHERE rs_activity_id = ?  `
+	_, err = o.Raw(sql, rsActivityId).Exec()
+	return
+}
+
+func GetRsActivityByRsActivityId(rsActivityId int) (item *RsActivity, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM rs_activity WHERE rs_activity_id=? `
+	err = o.Raw(sql, rsActivityId).QueryRow(&item)
+	return
+}
+
+func CheckCalendarActivitySellerrCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(1) AS count FROM  rs_activity_seller AS a
+		WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}

models/roadshow/calendar.go

@@ -315,6 +315,7 @@ type CalendarListView struct {
 	CompanyClassify        string `description:"客户分类"`
 	QuestionStatus         int    `description:"问答状态：0-未填写；1-已填写"`
 	QuestionMsgStatus      int    `description:"问答模板消息：0-未发送；1-已发送"`
+	RsActivityId           int    `description:"活动id"`
 }
 
 type CalendarListResp struct {
@@ -554,9 +555,20 @@ func GetRsMattersList(startDate, endDate string, researcherId int) (list []*RsMa
 	return
 }
 
+func GetRsMattersListBySysUserId(startDate, endDate string, researcherId string) (list []*RsMatters, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM  rs_matters AS a WHERE a.start_date>=? AND a.end_date<=? AND sys_user_id IN(?) `
+	//sql := `SELECT * FROM  rs_matters AS a WHERE sys_user_id IN(?) `
+	sql += ` ORDER BY a.create_time DESC `
+	_, err = o.Raw(sql, startDate, endDate, researcherId).QueryRows(&list)
+	//_, err = o.Raw(sql, researcherId).QueryRows(&list)
+	return
+}
+
 type CalendarDetailResp struct {
 	CalendarList  []*CalendarListView
 	RsMattersList []*RsMatters
+	RsSellerList  []*RsActivitySellerResp
 }
 
 type EditActivityReq struct {
@@ -675,6 +687,19 @@ func CheckCalendarResearcherCount(condition string, pars []interface{}) (count i
 	err = o.Raw(sql, pars).QueryRow(&count)
 	return
 }
+
+func CheckCalendarSellerCount(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT COUNT(1) AS count FROM  rs_calendar_researcher AS a
+            INNER JOIN rs_calendar as  b  ON a.rs_calendar_id = b.rs_calendar_id             
+		WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
 func GetResearcherFromAdmin(condition string, pars []interface{}) (lists []*system.Admin, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM admin WHERE 1=1 `

models/roadshow/company.go

@@ -64,10 +64,10 @@ func CompanySearchV2(sellerId, groupId int, keyWord, roleTypeCode string) (list
 			     1=1 
 			     AND IF  ( b.product_id = 1 , b.status IN ('正式', '试用', '永续') ,1=1 )  
 			     AND IF  ( b.product_id = 2 , b.status IN ('正式', '试用', '永续', '冻结', '流失') ,1=1 )  
-				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND a.company_name LIKE ?
+				 AND (b.seller_id = ? OR b.share_seller_id = ?  OR b.group_id = ? OR b.share_group_id = ?  ) AND ( a.company_name LIKE ?  OR a.credit_code LIKE  ? )
 			GROUP BY
 				b.company_id `
-		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord).QueryRows(&companies)
+		_, err = o.Raw(sql, sellerId, sellerId, groupId, groupId, keyWord, keyWord).QueryRows(&companies)
 		if err != nil {
 			return
 		}

routers/commentsRouter.go

@@ -7657,6 +7657,33 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"],
+        beego.ControllerComments{
+            Method: "Add",
+            Router: `/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"],
+        beego.ControllerComments{
+            Method: "Delete",
+            Router: `/delete`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:ActivityController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/list2`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers/roadshow:CalendarController"],
         beego.ControllerComments{
             Method: "Accept",
@@ -10231,6 +10258,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
+        beego.ControllerComments{
+            Method: "ActivityFiccList",
+            Router: `/seller/activity_ficc/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"] = append(beego.GlobalControllerRouter["hongze/hz_crm_api/controllers:CompanySellerController"],
         beego.ControllerComments{
             Method: "ShareCheckList2",

routers/router.go

@@ -242,6 +242,11 @@ func init() {
 				&roadshow.CalendarMeetingUserController{},
 			),
 		),
+		web.NSNamespace("/roadshow_seller",
+			web.NSInclude(
+				&roadshow.ActivityController{},
+			),
+		),
 		web.NSNamespace("/taglib",
 			web.NSInclude(
 				&controllers.VarietyTagController{},

services/roadshow/calendar_check.go

@@ -1,6 +1,8 @@
 package roadshow
 
-import "hongze/hz_crm_api/models/roadshow"
+import (
+	"hongze/hz_crm_api/models/roadshow"
+)
 
 func CheckMatters(startDateTime, endDateTime string, researcherId, rsMattersId int) (matterCount int, err error) {
 	var matterCondition string
@@ -81,3 +83,40 @@ func CheckCalendar(startDateTime, endDateTime, status string, researcherId, rsCa
 	}
 	return
 }
+
+func CheckActivity(startDateTime, endDateTime, status string, sellerId int) (calendarCount int, err error) {
+	var activityCondition string
+	var activityPars []interface{}
+
+	activityCondition += " AND seller_id = ? "
+	activityPars = append(activityPars, sellerId)
+
+	activityCondition += " AND status IN (" + status + ") "
+
+	activityCondition += ` AND (((? >=DATE_FORMAT(CONCAT(start_date," ",start_time),'%Y-%m-%d %H:%i:%S') AND ? <= DATE_FORMAT(CONCAT(end_date," ",end_time),'%Y-%m-%d %H:%i:%S')) OR (? >= DATE_FORMAT(CONCAT(start_date," ",start_time),'%Y-%m-%d %H:%i:%S') AND ? <= DATE_FORMAT(CONCAT(end_date," ",end_time),'%Y-%m-%d %H:%i:%S') )))`
+	activityPars = append(activityPars, startDateTime)
+	activityPars = append(activityPars, startDateTime)
+	activityPars = append(activityPars, endDateTime)
+	activityPars = append(activityPars, endDateTime)
+	calendarCount, err = roadshow.CheckCalendarActivitySellerrCount(activityCondition, activityPars)
+	return
+}
+
+func CheckResearcherBySysSserId(startDateTime, endDateTime, status string, sellerId int) (calendarCount int, err error) {
+
+	var researcherCondition string
+	var researcherMatterPars []interface{}
+
+	researcherCondition += " AND b.sys_user_id = ? "
+	researcherMatterPars = append(researcherMatterPars, sellerId)
+
+	researcherCondition += " AND a.status IN (" + status + ") "
+
+	researcherCondition += ` AND (((? >=DATE_FORMAT(CONCAT(start_date," ",start_time),'%Y-%m-%d %H:%i:%S') AND ? <= DATE_FORMAT(CONCAT(end_date," ",end_time),'%Y-%m-%d %H:%i:%S')) OR (? >= DATE_FORMAT(CONCAT(start_date," ",start_time),'%Y-%m-%d %H:%i:%S') AND ? <= DATE_FORMAT(CONCAT(end_date," ",end_time),'%Y-%m-%d %H:%i:%S') )))`
+	researcherMatterPars = append(researcherMatterPars, startDateTime)
+	researcherMatterPars = append(researcherMatterPars, startDateTime)
+	researcherMatterPars = append(researcherMatterPars, endDateTime)
+	researcherMatterPars = append(researcherMatterPars, endDateTime)
+	calendarCount, err = roadshow.CheckCalendarSellerCount(researcherCondition, researcherMatterPars)
+	return
+}

services/wechat_send_msg.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/models/roadshow"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
@@ -1884,3 +1885,68 @@ func SendWxMsgWithRaiWangYang(keyword1, keyword2, keyword3, keyword4 string, ope
 	err = SendTemplateMsg(sendInfo)
 	return
 }
+
+// SendWxMsgWithRoadshowSellerActivity 销售创建或取消活动的时候，推送模板消息
+func SendWxMsgWithRoadshowSellerActivity(keyword1, keyword2, keyword3, keyword4 string, openIdList []*system.OpenIdList, rsActivityId int) (err error) {
+	var msg string
+	defer func() {
+		if err != nil {
+			fmt.Println("err：", err)
+			go alarm_msg.SendAlarmMsg("销售创建或取消活动的时候，推送模板消息失败，SendWxMsgWithRoadshowSellerActivityErr："+err.Error()+";msg:"+msg, 3)
+		}
+		if msg != "" {
+			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
+		}
+	}()
+
+	//获取对应的多个销售信息
+	listSellerActivity, e := roadshow.GetRsActivitySellerListByActivityIds([]int{rsActivityId})
+	if e != nil {
+		err = errors.New("GetRsActivitySellerListByActivityIds, Err: " + e.Error())
+		return
+	}
+	var adminIds []string
+	for _, v := range listSellerActivity {
+		adminIds = append(adminIds, strconv.Itoa(v.SellerId))
+	}
+	sellerList, e := system.GetSysAdminByIds(strings.Join(adminIds, ","))
+	if e != nil {
+		err = errors.New("GetSysAdminByIds, Err: " + e.Error())
+		return
+	}
+	for _, sysAdmin := range sellerList {
+		if sysAdmin.OpenId != "" {
+			openIdObj := &system.OpenIdList{
+				OpenId:  sysAdmin.OpenId,
+				AdminId: sysAdmin.AdminId,
+			}
+			openIdList = append(openIdList, openIdObj)
+		}
+	}
+
+	openIdArr := make([]string, len(openIdList))
+	for i, v := range openIdList {
+		openIdArr[i] = v.OpenId
+	}
+	var wxAppPath string
+	wxAppPath = utils.WX_MSG_PATH_SSBG_SELLER_ACTIVITY_DETAIL + strconv.Itoa(rsActivityId)
+	sendInfo := new(SendWxTemplate)
+	//sendInfo.WxAppId = utils.AdminWxAppId
+	sendInfo.WxAppId = "wx1392111da5426e9e"
+	sendInfo.Keyword1 = keyword1
+	sendInfo.Keyword2 = keyword2
+	sendInfo.Keyword3 = keyword3
+	sendInfo.Keyword4 = keyword4
+	sendInfo.TemplateId = utils.WxMsgTemplateIdWithRoadshowActivityPending
+	if wxAppPath != "" && utils.RunMode == "release" {
+		sendInfo.RedirectUrl = wxAppPath
+	}
+	sendInfo.RedirectTarget = 2
+	sendInfo.Resource = wxAppPath
+	sendInfo.SendType = utils.TEMPLATE_MSG_ACTIVITY_APPOINTMENT
+	sendInfo.OpenIdArr = openIdArr
+	//fmt.Println(sendInfo)
+
+	err = SendTemplateMsg(sendInfo)
+	return
+}

utils/config.go

@@ -37,35 +37,36 @@ var (
 	TemplateIdByProduct      string //产品运行报告通知-模板ID
 	Wx_MFYX_Refund_NotifyUrl string //买方研选微信商户退款回调地址
 
-	TemplateRedirectUrl                      string //模板消息跳转地址
-	DayReportTemplateRedirectUrl             string //模板消息跳转地址（晨报、周报）
-	TemplateIdByCompanyApply                 string //客户申请单审批通知-模板ID
-	TemplateCompanyApplyRedirectUrl          string //审批单模板消息跳转地址
-	TemplateIdByCompanyReceive               string //销售跨部门领取客户通知-模板ID
-	TemplateIdByCompanyReceivePermission     string //销售"添加客户/领取客户"权限变更通知
-	WxMsgTemplateIdActivityChangeApply       string //查研观向活动变更通知-模板ID
-	WxMsgTemplateIdActivityChangeApplyXzs    string //查研观向活动变更通知-模板ID（小助手）
-	TemplateIdByProductXzs                   string //产品运行报告通知-模板ID(小助手)
-	WxMsgTemplateIdActivityApplyXzs          string //查研观向销售帮对应客户报名通知-模板ID
-	WxMsgTemplateIdCompanyApprovalMessageRai string //权益销售签约成功通知查研观向小助手模版消息
-	WxCygxAppId                              string //查研观向小程序APPID
-	WxCygxAppSecret                          string //查研观向小程序 秘钥
-	WxMsgTemplateIdAskByUser                 string //查研观向用户提问新消息推送ID
-	WxCrmAppId                               string //随手办公小程序APPID
-	WxPublicIdXzs                            string //查研观向小助手公众号
-	WxPublicSecretXzs                        string //查研观向小助手公众号
-	WxYbAppId                                string //弘则研报小程序APPID
-	YiDongHuaWeiYunUrl                       string //易董 华为云请求域名
-	YiDongZhengTongYunUrl                    string //易董 证通云请求域名
-	YiDongZhengTongYunClientId               string //易董 证通云client_id
-	YiDongZhengTongYunClientSecret           string //易董 证通云client_secret
-	WxMsgTemplateIdWithRoadshowPending       string //路演->研究员收到待处理的申请
-	WxMsgTemplateIdWithRoadshowDetailResult  string //路演->销售收到处理结果
-	WxMsgTemplateIdWithRoadshowDeleteNotice  string //路演->研究员收到活动删除通知
-	CYGX_WEB_URL                             string //查研观向web端网址
-	CYGX_MFYX_URL                            string //查研观向web端网址
-	WxMfyxAppId                              string //买方研选小程序APPID
-	WxMfyxAppSecret                          string //买方研选小程序 秘钥
+	TemplateRedirectUrl                        string //模板消息跳转地址
+	DayReportTemplateRedirectUrl               string //模板消息跳转地址（晨报、周报）
+	TemplateIdByCompanyApply                   string //客户申请单审批通知-模板ID
+	TemplateCompanyApplyRedirectUrl            string //审批单模板消息跳转地址
+	TemplateIdByCompanyReceive                 string //销售跨部门领取客户通知-模板ID
+	TemplateIdByCompanyReceivePermission       string //销售"添加客户/领取客户"权限变更通知
+	WxMsgTemplateIdActivityChangeApply         string //查研观向活动变更通知-模板ID
+	WxMsgTemplateIdActivityChangeApplyXzs      string //查研观向活动变更通知-模板ID（小助手）
+	TemplateIdByProductXzs                     string //产品运行报告通知-模板ID(小助手)
+	WxMsgTemplateIdActivityApplyXzs            string //查研观向销售帮对应客户报名通知-模板ID
+	WxMsgTemplateIdCompanyApprovalMessageRai   string //权益销售签约成功通知查研观向小助手模版消息
+	WxCygxAppId                                string //查研观向小程序APPID
+	WxCygxAppSecret                            string //查研观向小程序 秘钥
+	WxMsgTemplateIdAskByUser                   string //查研观向用户提问新消息推送ID
+	WxCrmAppId                                 string //随手办公小程序APPID
+	WxPublicIdXzs                              string //查研观向小助手公众号
+	WxPublicSecretXzs                          string //查研观向小助手公众号
+	WxYbAppId                                  string //弘则研报小程序APPID
+	YiDongHuaWeiYunUrl                         string //易董 华为云请求域名
+	YiDongZhengTongYunUrl                      string //易董 证通云请求域名
+	YiDongZhengTongYunClientId                 string //易董 证通云client_id
+	YiDongZhengTongYunClientSecret             string //易董 证通云client_secret
+	WxMsgTemplateIdWithRoadshowDetailResult    string //路演->销售收到处理结果
+	WxMsgTemplateIdWithRoadshowDeleteNotice    string //路演->研究员收到活动删除通知
+	WxMsgTemplateIdWithRoadshowActivityPending string //路演->销售收到添加成功与删除通知
+	WxMsgTemplateIdWithRoadshowPending         string //路演->研究员收到待处理的申请
+	CYGX_WEB_URL                               string //查研观向web端网址
+	CYGX_MFYX_URL                              string //查研观向web端网址
+	WxMfyxAppId                                string //买方研选小程序APPID
+	WxMfyxAppSecret                            string //买方研选小程序 秘钥
 
 	WxMsgCategoryTemplateIdActivityChangeApply       string //买方研选活动变更通知-类目模板ID
 	WxMsgCategoryTemplateIdActivityCancleApply       string //买方研选活动取消通知-类目模板ID
@@ -399,9 +400,10 @@ func WxDebug() {
 		WxMsgTemplateIdActivityChangeApply = "CB7bOl7f3viMG4s1uhRo7WM0Jbx3WvodKuIZ8A_z8fM"
 
 		//路演
-		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"      //路演->研究员收到待处理的申请
-		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4" //路演->销售收到处理结果
-		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->研究员收到活动删除通知
+		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"         //路演->研究员收到待处理的申请
+		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4"    //路演->销售收到处理结果
+		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450"    //路演->研究员收到活动删除通知
+		WxMsgTemplateIdWithRoadshowActivityPending = "f1bVCs2kaZsFB3S16El-gBcce3mqoUJzVeS03krtW-Q" //路演->销售收到添加成功与删除通知
 
 		// 研报小程序
 		WxMsgTemplateIdWithYbCommunityQuestion = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 研报小程序->问答社区回复通知
@@ -450,9 +452,10 @@ func WxRelease() {
 		//销售"添加客户/领取客户"权限变更通知
 		TemplateIdByCompanyReceivePermission = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450"
 		//路演
-		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"      //路演->研究员收到待处理的申请
-		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4" //路演->销售收到处理结果
-		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" //路演->研究员收到活动删除通知
+		WxMsgTemplateIdWithRoadshowPending = "1JG9fvKx9o9B-wkZe_gBFQQzMBnp07-hvpZI9QiFcKQ"         //路演->研究员收到待处理的申请
+		WxMsgTemplateIdWithRoadshowDetailResult = "D6AFTJ7CbDDFBYg1R-HRir5bBXkIqGrwUtb2bjN-Wr4"    //路演->销售收到处理结果
+		WxMsgTemplateIdWithRoadshowDeleteNotice = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450"    //路演->研究员收到活动删除通知
+		WxMsgTemplateIdWithRoadshowActivityPending = "f1bVCs2kaZsFB3S16El-gBcce3mqoUJzVeS03krtW-Q" //路演->销售收到添加成功与删除通知
 
 		// 研报小程序
 		WxMsgTemplateIdWithYbCommunityQuestion = "rciDm9ThigRBGi1SZ4TFd74XA4aoAxSz_ugdv_tZ450" // 研报小程序->问答社区回复通知

utils/constants.go

@@ -643,3 +643,8 @@ const (
 	WX_MSG_PATH_YX_ARTICLE_DETAIL  = "pages-user/reportDetail/reportDetail?id="         //研选纪要详情
 
 )
+
+// 随手办公小程序 模版消息路由
+const (
+	WX_MSG_PATH_SSBG_SELLER_ACTIVITY_DETAIL = "/pages-approve/activity/ficcActivityDetail?TemplateMsg=true&RsActivityId=" //随手办公小程序，销售添加活动详情
+)