Browse Source

no message

xingzai 1 year ago
parent
commit
2d42163731
2 changed files with 17 additions and 52 deletions
  1. 13 11
      controllers/user.go
  2. 4 41
      services/wechat_send_msg.go

+ 13 - 11
controllers/user.go

@@ -1087,14 +1087,6 @@ func (this *UserController) ApplyTryOut() {
 				}
 				applyMethod = applyMethod + "," + title
 			}
-			openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
-			if openIpItem != nil && openIpItem.OpenId != "" {
-				if req.ApplyMethod != 2 {
-					req.RealName = user.RealName
-					req.CompanyName = user.CompanyName
-				}
-				go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
-			}
 		}
 	} else {
 		//获取销售信息
@@ -1132,15 +1124,25 @@ func (this *UserController) ApplyTryOut() {
 	//	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
 	//}
 	//如果对应销售不存在就给王芳,汪洋推模版消息
-	if sellerItem == nil {
-		go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
-	}
+
 	err = models.AddApplyRecord(&req, user.Mobile, user.CompanyName, uid, user.CompanyId, CompanyIdType)
 	if err != nil {
 		br.Msg = "申请失败"
 		br.ErrMsg = "申请失败,Err:" + err.Error()
 		return
 	}
+	if sellerItem == nil {
+		go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
+	} else {
+		openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+		if openIpItem != nil && openIpItem.OpenId != "" {
+			if req.ApplyMethod != 2 {
+				req.RealName = user.RealName
+				req.CompanyName = user.CompanyName
+			}
+			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+		}
+	}
 	//添加成功后,设置5分钟缓存,不允许重复添加
 	//utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*60)
 

+ 4 - 41
services/wechat_send_msg.go

@@ -105,50 +105,13 @@ func SendInterviewApplyCancelTemplateMsg(realName, companyName, mobile, articleT
 
 // 权限申请
 func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod string, itemOpenid *models.OpenIdList) (err error) {
-	var msg string
+
 	defer func() {
 		if err != nil {
-			go utils.SendEmail("发送模版消息失败"+time.Now().Format("2006-01-02 15:04:05"), msg+";Err:"+err.Error(), utils.EmailSendToUsers)
-			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,手机号", mobile, "公司:", companyName, "手机号:", mobile), 2)
-		}
-		if msg != "" {
-			utils.FileLog.Info("发送模版消息失败,msg:%s", msg)
+			go utils.SendAlarmMsg(fmt.Sprint("权限申请模板消息推送消息失败,手机号", mobile, "公司:", companyName, "手机号:", mobile, ";Err:"+err.Error()), 2)
 		}
-	}()
 
-	//var accessToken string
-	//accessToken, err = models.GetWxAccessTokenByXzs()
-	//if err != nil {
-	//	msg = "GetWxAccessToken Err:" + err.Error()
-	//	return
-	//}
-	//if accessToken == "" {
-	//	msg = "accessToken is empty"
-	//	return
-	//}
-	//sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	//
-	//sendMap := make(map[string]interface{})
-	//sendData := make(map[string]interface{})
-	//
-	//keyword1 := "权限申请:" + realName + "【" + companyName + "】"
-	//first := "查研观向有一条新的权限申请,请及时处理。"
-	//keyword2 := mobile
-	//keyword3 := time.Now().Format(utils.FormatDateTime)
-	//keyword4 := applyMethod
-	//fontColor := "#D9001B"
-	//sendData["first"] = map[string]interface{}{"value": first, "color": fontColor}
-	//sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": fontColor}
-	//sendData["keyword2"] = map[string]interface{}{"value": keyword2, "color": fontColor}
-	//sendData["keyword3"] = map[string]interface{}{"value": keyword3, "color": fontColor}
-	//sendData["keyword4"] = map[string]interface{}{"value": keyword4, "color": fontColor}
-	//if utils.RunMode == "release" {
-	//	sendMap["template_id"] = utils.WxMsgTemplateIdApplyXzs
-	//} else {
-	//	sendMap["template_id"] = utils.WxMsgTemplateIdApply
-	//}
-	//sendMap["data"] = sendData
-	//sendTemplateMsg(sendUrl, sendMap, itemOpenid, mobile, utils.TEMPLATE_MSG_CYGX_APPLY)
+	}()
 
 	var first string
 	var keyword1 string
@@ -164,7 +127,7 @@ func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod s
 		return
 	}
 	//如果是潜在客户就推送可查看详情的模版消息
-	if detail.ApplyMethod == 2 && utils.RunMode == "release" {
+	if detail.ApplyMethod == 2 {
 		redirectUrl = utils.WX_MSG_PATH_APPLY_DETAIL + strconv.Itoa(detail.ApplyRecordId)
 	}
 	keyword1 = "权限申请:" + realName + "【" + companyName + "】"