Merge branch 'cygx_need_wx_msg_5.9' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_10.5.3

controllers/user.go

@@ -525,7 +525,7 @@ func (this *UserController) ApplyTryOut() {
 					req.RealName = user.RealName
 					req.CompanyName = user.CompanyName
 				}
-				go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+				//go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
 			}
 		}
 	} else {
@@ -556,7 +556,7 @@ func (this *UserController) ApplyTryOut() {
 	//	utils.FileLog.Info("推送消息 %s %s,%s,%s,%s", req.RealName, req.CompanyName, mobile, openIpItem.OpenId, applyMethod)
 	//	go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
 	//}
-	go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
+	//go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
 
 	err = models.AddApplyRecord(&req, user.Mobile, user.CompanyName, uid, user.CompanyId, CompanyIdType)
 	if err != nil {
@@ -564,6 +564,14 @@ func (this *UserController) ApplyTryOut() {
 		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 != "" {
+			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+		}
+	}
 	//添加成功后，设置5分钟缓存，不允许重复添加
 	//utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*60)
 

services/wechat_send_msg.go

@@ -177,7 +177,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 + "】"