Merge branch 'cygx_need_p2_775' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity_special.go

@@ -246,6 +246,16 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 			itemBill.RegisterPlatform = 1
 			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
 
+			var itemMeeting = new(models.CygxActivitySpecialMeetingDetail)
+			itemMeeting.UserId = user.UserId
+			itemMeeting.ActivityId = activityId
+			itemMeeting.CreateTime = time.Now()
+			itemMeeting.Mobile = user.Mobile
+			itemMeeting.Email = user.Email
+			itemMeeting.CompanyId = user.CompanyId
+			itemMeeting.CompanyName = user.CompanyName
+			itemMeeting.RealName = user.RealName
+
 			go services.ActivitySpecialUserRmind(user, activityId, 2)
 			go services.ActivitySpecialUserAddTrip(user, activityId)
 			//判断是删除还是添加
@@ -310,7 +320,20 @@ func (this *ActivitySpecialCoAntroller) SpecialTripAdd() {
 					itemBill.BillDetailed = 0 //48小时之内，取消报名之后二次报名，不扣除流水记录
 				}
 			}
-			go models.AddCygxActivitySpecialTripBill(itemBill)
+			//添加流水记录
+			err = models.AddCygxActivitySpecialTripBill(itemBill)
+			if err != nil {
+				br.Msg = "报名失败，"
+				br.ErrMsg = "AddCygxActivitySpecialTripBill，Err:" + err.Error()
+				return
+			}
+			//添加数据到会信息
+			err = models.AddCygxActivitySpecialMeetingDetail(itemMeeting)
+			if err != nil {
+				br.Msg = "报名失败，"
+				br.ErrMsg = "AddCygxActivitySpecialMeetingDetail，Err:" + err.Error()
+				return
+			}
 		}
 	} else {
 		hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)

models/activity_special_meeting_detail.go

@@ -0,0 +1,27 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxActivitySpecialMeetingDetail struct {
+	Id          int       `orm:"column(id);pk"`
+	UserId      int       `description:"用户id"`
+	ActivityId  int       `description:"活动ID"`
+	CreateTime  time.Time `description:"创建时间"`
+	Mobile      string    `description:"手机号"`
+	Email       string    `description:"邮箱号"`
+	CompanyId   int       `description:"公司ID"`
+	CompanyName string    `description:"公司名称"`
+	IsMeeting   int       `description:"是否到会  1.是 ，0否"`
+	IsAirborne  int       `description:"是否属于空降  1.是 ，0否"`
+	RealName    string    `description:"真实姓名"`
+}
+
+// 添加
+func AddCygxActivitySpecialMeetingDetail(item *CygxActivitySpecialMeetingDetail) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(item)
+	return
+}

models/db.go

@@ -98,6 +98,7 @@ func init() {
 		new(CygxUserFreeeButton),
 		new(UserInvitee),
 		new(CygxActivitySpecialSignup),
+		new(CygxActivitySpecialMeetingDetail),
 		new(CygxUserFollowSpecial),
 		new(CygxChart),
 		new(CygxChartCollect),

services/company_permission.go

@@ -240,6 +240,7 @@ func GetSellNameMapByCompanyIds(companyIds []int) (respMap map[int]string) {
 	var pars []interface{}
 	var condition string
 	respMap = make(map[int]string, 0)
+	condition = "  AND product_id = 2 "
 	list, e := models.GetCompanyProductList(condition, pars)
 	if e != nil {
 		err = errors.New("GetCompanyProductList, Err: " + e.Error())
@@ -251,8 +252,7 @@ func GetSellNameMapByCompanyIds(companyIds []int) (respMap map[int]string) {
 	return
 }
 
-
-//获取用户对应的权限简单版
+// 获取用户对应的权限简单版
 func GetUserHasPermissionSimple(user *models.WxUserItem) (hasPermission int, err error) {
 	//HasPermission int `description:"1:有该行业权限,正常展示，2：无该行业权限，不存在权益客户下（ficc），3:无该品类权限,已提交过申请，4：无该品类权限,未提交过申请，5：潜在客户，未提交过申请，6：潜在客户,已提交过申请"`
 	uid := user.UserId
@@ -280,4 +280,4 @@ func GetUserHasPermissionSimple(user *models.WxUserItem) (hasPermission int, err
 		}
 	}
 	return
-}
+}