Merge branch 'master' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/company.go

@@ -4522,6 +4522,11 @@ func (this *CompanyController) Delete() {
 		br.Ret = 408
 		return
 	}
+	//禁止删除
+	br.Msg = "删除失败"
+	br.ErrMsg = "删除失败"
+	return
+
 	var req company.DeletePptReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {

controllers/company_user.go

@@ -1539,6 +1539,10 @@ func (this *CompanyUserController) DeleteUser() {
 		br.Ret = 408
 		return
 	}
+	//禁止删除
+	br.Msg = "删除失败"
+	br.ErrMsg = "删除失败"
+	return
 	var req company.DeleteUserReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
@@ -2527,6 +2531,10 @@ func (this *CompanyController) PotentialUserDelete() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
+	//禁止删除
+	br.Msg = "删除失败"
+	br.ErrMsg = "删除失败"
+	return
 	var req models.PotentialUserDeleteReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {

models/roadshow/rs_calendar_relation.go

@@ -371,10 +371,11 @@ func GetRsCalendarResearcherInfoIByResearcherIdAndDate(researcherId int, startDa
 	//WHERE b.source=1 and a.status=2 and c.calendar_type=1 and a.researcher_id=? and start_date>=? and end_date <= ? `
 
 	//杭州创建的路演活动，如果上海被删除了，那么也要同步删除杭州的（所以相对于上面的逻辑，下面移除了来源的where条件）
+	// 需求池1065 同步上海CRM路演信息时，若某路演在我们的CRM中创建，即便在上海CRM中没有查到，也不做删除
 	sql := `SELECT a.*,c.third_calendar_id,c.calendar_type FROM rs_calendar_researcher a 
 join rs_calendar b on a.rs_calendar_id=b.rs_calendar_id
 join rs_calendar_relation c on a.rs_calendar_researcher_id=c.self_calendar_id
-WHERE a.status=2 and c.calendar_type=1 and a.researcher_id=? and start_date>=? and end_date <= ? `
+WHERE a.status=2 and c.calendar_type=1 AND b.source = 1 and a.researcher_id=? and start_date>=? and end_date <= ? `
 	_, err = o.Raw(sql, researcherId, startDate, endDate).QueryRows(&items)
 	return
 }

models/system/sys_admin.go

@@ -466,19 +466,21 @@ func GetSysuserRaiList() (items []*AdminItem, err error) {
 	sql := `SELECT
 			real_name,
 			mobile,
+			group_id,
 			group_name 
 		FROM
 			admin 
 		WHERE
-			role_type_code IN ('rai_group','rai_seller')
-			AND group_id NOT IN ( 19, 10, 17 )
+			role_type_code IN ( 'rai_group', 'rai_seller' ) 
+			AND group_id NOT IN ( 19, 10, 17, 68, 72 ) 
 			AND enabled = 1 
-			OR real_name IN ( '沈涛', '张传星' ) ` // 先写死，看情况要不要改
+			OR real_name IN ( '沈涛', '张传星' ) 
+			OR ( group_name = '未分组' AND enabled = 1 ) ` // 先写死，看情况要不要改
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-// GetSysuserRaiList 获取除服务组之外的所有权益销售
+// GetSysuserRaiListNoServer 获取除服务组之外的所有权益销售
 func GetSysuserRaiListNoServer() (items []*AdminItem, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT  * FROM admin WHERE role_type_code  IN ('rai_group','rai_seller')   AND role_name NOT IN ('权益服务销售','权益服务组长')  `
@@ -557,4 +559,4 @@ func UpdateAdminRoleInfoByRoleId(roleId int, roleName string, roleTypeCode strin
 	sql := `UPDATE admin SET role_name = ?, role_type_code = ? WHERE role_id = ?`
 	_, err = o.Raw(sql, roleName, roleTypeCode, roleId).Exec()
 	return
-}
+}

services/cygx/morning_meeting.go

@@ -85,7 +85,7 @@ func AddCygxMorningMeetingReviewLog(itemReq *cygx.CygxMorningMeetingReviewChapte
 	}
 
 	if status == 2 {
-		go SendWxMsgMorningMeetingApproveSubmit(int(newId))
+		SendWxMsgMorningMeetingApproveSubmit(int(newId))
 	}
 	return
 }
@@ -97,6 +97,7 @@ func SendWxMsgMorningMeetingApproveSubmit(logId int) (err error) {
 			go alarm_msg.SendAlarmMsg(fmt.Sprint("晨会点评内容完成审核时，给提交人发送模板消息失败 logId ", logId, err.Error()), 2)
 		}
 	}()
+	time.Sleep(1 * time.Second) // 延迟1秒
 	var first string
 	var keyword1 string
 	var keyword2 string

utils/config.go

@@ -449,6 +449,7 @@ func WxRelease() {
 	//模板消息
 	{
 		TemplateIdByProduct = "Cp2wF8gvBtxyWV4DeYuI172oqwyYXVRSm3AyJO42d84"
+		WxMsgTemplateIdAskByUser = "IpS-yuNNQc8osCoy20jPHNkvBUyKRL1NGn7c0G9xmQA" //手机号用户【XXX】发送模板消息模板ID(小助手)
 		TemplateIdByCompanyApply = "yqaDUavXAKBpsPqTr0zYXAGIQYeCijZtWwFsT07wTbE"
 		WxMsgTemplateIdActivityChangeApply = "dYg6iHooRq74PyCXmw_Ns7qdJZmbtLoKS2p2FKeaXl0"
 		//销售跨部门领取客户通知