Merge branch 'fix_need_cygx4.2.1' of hongze/hongze_cygx into master

controllers/activity.go

@@ -775,6 +775,14 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				br.Data = resp
 				return
 			}
+			var sellerName string
+			sellerName, err = models.GetCompanySellerName(user.CompanyId)
+			if err != nil {
+				br.Msg = "报名失败！"
+				br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
+				return
+			}
+
 			//人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 			//如果是下面几种情况则对报名信息做判断限制 （公司调研电话会（限制人数）、公司线下调研、专家/分析师线下沙龙）
 			if (activityInfo.ActivityTypeId == 3 && activityInfo.IsLimitPeople == 1) || activityInfo.ActivityTypeId > 3 {
@@ -818,6 +826,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				//解除报名限制之后二次报名相同活动
 				if totalUserRestrictCount > 0 && totalRestrict == 0 && resp.GoBindEmail != true {
 					item.UserId = uid
+					item.RealName = user.RealName
+					item.SellerName = sellerName
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -862,6 +872,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 
 				if signupStatus != "Success" && totalMy == 0 && resp.GoBindEmail != true {
 					item.UserId = uid
+					item.RealName = user.RealName
+					item.SellerName = sellerName
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -906,6 +918,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			}
 			if signupStatus == "Success" && resp.GoBindEmail != true {
 				item.UserId = uid
+				item.RealName = user.RealName
+				item.SellerName = sellerName
 				item.ActivityId = activityId
 				item.CreateTime = time.Now()
 				item.Mobile = user.Mobile

models/activity_signup.go

@@ -20,6 +20,8 @@ type CygxActivitySignup struct {
 	DoFailType     int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
 	OutboundMobile string    `description:"外呼手机号"`
 	CountryCode    string    `description:"手机国家区号"`
+	RealName       string    `description:"用户实际名称"`
+	SellerName     string    `description:"所属销售"`
 }
 
 type SignupStatus struct {

models/company.go

@@ -131,3 +131,15 @@ func GetSellerDetailAllByCompanyId(companyId int) (item *CompanyDetail, err erro
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }
+
+func GetCompanySellerName(companyId int) (sellerName string, err error) {
+	sql := ` SELECT
+			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS sellerName 
+		FROM
+			company_product AS p
+		WHERE
+			p.company_id = ? `
+	o := orm.NewOrm()
+	err = o.Raw(sql, companyId).QueryRow(&sellerName)
+	return
+}