Merge branch 'fix_cygx3.1' of hongze/hongze_cygx into master

controllers/activity.go

@@ -889,7 +889,12 @@ func (this *ActivityCoAntroller) SignupAdd() {
 					item.SignupType = signupType
 					item.DoFailType = item.FailType
 					item.OutboundMobile = user.Mobile
-					item.CountryCode = user.CountryCode
+					if user.CountryCode == "" {
+						item.CountryCode = "86"
+					} else {
+						item.CountryCode = user.CountryCode
+					}
+
 					//添加报名信息，但是不加入日程
 					_, errSignup := models.AddActivitySignupNoSchedule(item)
 					if errSignup != nil {

models/activity.go

@@ -398,13 +398,14 @@ type SignupExportRep struct {
 
 func GetSignupExport(activityId int) (item []*SignupExportRep, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.*  ,a.is_limit_people,u.real_name,p.seller_name
+	sql := `SELECT s.*  ,a.is_limit_people,u.real_name,
+			(SELECT p.seller_name from company_product as p WHERE p.company_id = u.company_id  AND  p.product_id = 2 )  AS seller_name
 			FROM
 			cygx_activity_signup AS s
 			LEFT JOIN wx_user AS u ON u.user_id = s.user_id
 			LEFT JOIN cygx_activity AS a ON a.activity_id = s.activity_id
 			LEFT JOIN company_product AS p ON p.company_id = u.company_id 
-			WHERE a.activity_id = ?  AND s.fail_type = 0  `
+			WHERE a.activity_id = ?  AND s.do_fail_type = 0 GROUP BY s.id `
 	_, err = o.Raw(sql, activityId).QueryRows(&item)
 	return
 }

utils/config.go

@@ -86,11 +86,11 @@ func init() {
 		IndexName = "cygx_article_v0712"
 
 		//接收附件邮箱
-		EmailTechnology = "mlluo@hzinsights.com;jxu@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com" //科技行业专家邮箱
-		EmailMedicine = "xlzheng@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                        //医药行业专家邮箱
-		EmailConsumption = "yrhuang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                     //消费行业专家邮箱
-		EmailZhizao = "xfma@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                         //智造行业专家邮箱
-		EmailStrategy = "xfma@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com"                                           //策略行业专家邮箱
+		EmailTechnology = "mlluo@hzinsights.com;jxu@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com" //科技行业专家邮箱
+		EmailMedicine = "xlzheng@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                        //医药行业专家邮箱
+		EmailConsumption = "yrhuang@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                     //消费行业专家邮箱
+		EmailZhizao = "xfma@hzinsights.com;agne@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                         //智造行业专家邮箱
+		EmailStrategy = "xfma@hzinsights.com;tshen@hzinsights.com;cxzhang@hzinsights.com;jhwang@hzinsights.com"                                           //策略行业专家邮箱
 
 		//EmailTechnology = "jhwang@hzinsights.com;cxzhang@hzinsights.com" //科技行业专家邮箱
 		//EmailMedicine = "jhwang@hzinsights.com"                          //医药行业专家邮箱