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

controllers/user.go

@@ -530,7 +530,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 {
@@ -561,10 +561,8 @@ 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)
 	//}
-	//如果对应销售不存在就给王芳，汪洋推模版消息
-	if sellerItem == nil {
-		go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
-	}
+
+	//go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, isResearch)
 
 	item := new(models.CygxApplyRecord)
 	item.UserId = user.UserId
@@ -583,6 +581,21 @@ func (this *UserController) ApplyTryOut() {
 	}
 	item.RegisterPlatform = utils.REGISTER_PLATFORM
 	err = models.AddApplyRecord(item)
+
+	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 != "" {
+			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+		}
+	}
+
 	//添加成功后，设置5分钟缓存，不允许重复添加
 	//utils.Rc.SetNX(cacheKey, user.Mobile, time.Second*60)
 

models/apply_record.go

@@ -34,6 +34,7 @@ func AddApplyRecord(item *CygxApplyRecord) (err error) {
 		}
 	}()
 	_, err = o.Insert(item)
+
 	if err != nil {
 		return
 	}
@@ -55,3 +56,11 @@ func GetApplyRecordCount(userId int) (count int, err error) {
 	err = o.Raw(sql, userId).QueryRow(&count)
 	return
 }
+
+// 通过手机号获取详情
+func GetCygxApplyRecordByMobile(mobile string) (item *CygxApplyRecord, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_apply_record   WHERE mobile=? AND status=0   ORDER BY apply_record_id DESC   LIMIT 1 `
+	err = o.Raw(sql, mobile).QueryRow(&item)
+	return
+}

services/wechat_send_msg.go

@@ -9,6 +9,7 @@ import (
 	"hongze/hongze_clpt/utils"
 	"io/ioutil"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -170,6 +171,15 @@ func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod s
 	var keyword4 string
 	var remark string
 	var redirectUrl string
+	detail, e := models.GetCygxApplyRecordByMobile(mobile)
+	if e != nil {
+		err = errors.New("GetActivitySignupNomeetingCountList" + e.Error())
+		return
+	}
+	//如果是潜在客户就推送可查看详情的模版消息
+	if detail.ApplyMethod == 2 {
+		redirectUrl = utils.WX_MSG_PATH_APPLY_DETAIL + strconv.Itoa(detail.ApplyRecordId)
+	}
 	keyword1 = "权限申请：" + realName + "【" + companyName + "】"
 	keyword2 = mobile
 	keyword3 = time.Now().Format(utils.FormatDateTime)

utils/constants.go

@@ -174,6 +174,7 @@ const (
 	WX_MSG_PATH_ACTIVITY_SPECIAL_DETAIL  = "activityPages/specialDetail/specialDetail?id="   //专项调研活动模板消息地址
 	WX_MSG_PATH_ACTIVITY_INDUSTRYR_EPORT = "reportPages/IndustryReport/IndustryReport?id="   //产业文章列表模板消息地址
 	WX_MSG_PATH_ACTIVITY_DETAIL          = "activityPages/activityDetail/activityDetail?id=" //活动模板消息地址
+	WX_MSG_PATH_APPLY_DETAIL             = "pages-message/applyFor/applyFor?id="             //潜在用户试用权限申请
 )
 
 // 微信模板消息推送公共接口的秘钥