查研观向 5.2 优化

controllers/user.go

@@ -166,6 +166,14 @@ func (this *UserController) Login() {
 				userItem.CreateTime = time.Now()
 				userItem.InviteedUserId = strconv.Itoa(userId)
 				userItem.InviteeUserId = req.ShareUserCode
+				shareUserId, _ := strconv.Atoi(req.ShareUserCode)
+				inviteeUser, _ := models.GetWxUserItemByUserId(shareUserId)
+				if inviteeUser != nil {
+					userItem.InviteeMobile = inviteeUser.Mobile
+					userItem.InviteeCompany = inviteeUser.CompanyName
+					userItem.InviteeCompanyId = inviteeUser.CompanyId
+					userItem.InviteeEmail = inviteeUser.Email
+				}
 				models.AddUserInvite(userItem)
 			}
 		}
@@ -757,6 +765,8 @@ func (this *UserController) ApplyTryOut() {
 			mobile = user.Email
 		}
 	}
+	//用户状态，1：潜在客户 、2：现有客户 、3：FICC客户 、4：现有客户（正式，无对应权限） 、5：现有客户（试用，无对应权限）  、6：现有客户（试用暂停） 、7：现有客户（冻结） 、8：现有客户（流失）?
+	CompanyIdType := 1
 	applyMethod := ""
 	cnf, _ := models.GetConfigByCode("tpl_msg")
 	if cnf != nil {
@@ -778,6 +788,7 @@ func (this *UserController) ApplyTryOut() {
 						return
 					}
 					if companyProduct != nil && companyProduct.IsSuspend == 1 {
+						CompanyIdType = 6
 						applyMethod = "试用暂停客户"
 					} else {
 						if companyItem.Status == "正式" || companyItem.Status == "试用" {
@@ -785,6 +796,16 @@ func (this *UserController) ApplyTryOut() {
 						} else if companyItem.Status == "冻结" || companyItem.Status == "流失" {
 							applyMethod = companyItem.Status + "客户"
 						}
+						switch companyItem.Status {
+						case "正式":
+							CompanyIdType = 4
+						case "试用":
+							CompanyIdType = 5
+						case "冻结":
+							CompanyIdType = 7
+						case "流失":
+							CompanyIdType = 8
+						}
 					}
 					applyMethod = applyMethod + "," + title
 				}
@@ -798,8 +819,10 @@ func (this *UserController) ApplyTryOut() {
 				return
 			}
 			if sellerItem != nil {
+				CompanyIdType = 3
 				applyMethod = "FICC客户"
 			} else {
+				CompanyIdType = 1
 				applyMethod = "潜在客户"
 			}
 			if detailId > 0 {
@@ -817,7 +840,7 @@ func (this *UserController) ApplyTryOut() {
 			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, openIpItem.OpenId, applyMethod)
 		}
 	}
-	err = models.AddApplyRecord(&req, user.Mobile, user.CompanyName, uid, user.CompanyId)
+	err = models.AddApplyRecord(&req, user.Mobile, user.CompanyName, uid, user.CompanyId, CompanyIdType)
 	if err != nil {
 		br.Msg = "申请失败"
 		br.ErrMsg = "申请失败，Err:" + err.Error()

models/apply_record.go

@@ -15,7 +15,7 @@ type CygxApplyRecord struct {
 	ApplyMethod     int       `description:"1:已付费客户申请试用，2:非客户申请试用"`
 }
 
-func AddApplyRecord(item *ApplyTryReq, mobile, companyNamePay string, userId, companyIdPay int) (err error) {
+func AddApplyRecord(item *ApplyTryReq, mobile, companyNamePay string, userId, companyIdPay, CompanyIdType int) (err error) {
 	o, err := orm.NewOrm().Begin()
 	if err != nil {
 		return
@@ -28,8 +28,8 @@ func AddApplyRecord(item *ApplyTryReq, mobile, companyNamePay string, userId, co
 		}
 	}()
 
-	sql := `INSERT INTO cygx_apply_record (user_id,business_card_url, real_name,company_name, mobile,create_time, apply_method,company_id_pay,company_name_pay)
-          VALUES(?,?,?,?,?,?,?,?,?) `
+	sql := `INSERT INTO cygx_apply_record (user_id,business_card_url, real_name,company_name, mobile,create_time, apply_method,company_id_pay,company_name_pay,company_id_type)
+          VALUES(?,?,?,?,?,?,?,?,?,?) `
 	_, err = o.Raw(sql, userId, item.BusinessCardUrl, item.RealName, item.CompanyName, mobile, time.Now(), item.ApplyMethod, companyIdPay, companyNamePay).Exec()
 	if err != nil {
 		return

models/user_invitee.go

@@ -12,6 +12,10 @@ type UserInvitee struct {
 	CreateTime        time.Time `description:"创建时间"`
 	InviteedMobile    string    `description:"手机号"`
 	InviteedCompanyId int       `description:"公司ID"`
+	InviteeMobile     string    `description:"邀请人手机号"`
+	InviteeCompany    string    `description:"邀请人公司名称"`
+	InviteeCompanyId  int       `description:"邀请人公司ID"`
+	InviteeEmail      string    `description:"邀请人邮箱"`
 }
 
 //添加收藏信息