Merge branch 'cygx/cygx_need_p1-875' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity_special.go

@@ -523,7 +523,7 @@ func (this *ActivitySpecialCoAntroller) PublishAndCancel() {
 	} else {
 		item.PublishStatus = 0
 		// 取消专项调研返点
-		go cygxService.ActivitySpecialPublishAndCancel(activityInfo)
+		//go cygxService.ActivitySpecialPublishAndCancel(activityInfo)
 	}
 	updateParams["PublishStatus"] = item.PublishStatus
 	item.ActivityId = req.ActivityId

controllers/cygx/activity_special_trip.go

@@ -149,6 +149,7 @@ func (this *ActivitySpecialTripCoAntroller) AddUser() {
 				itemBill.BillDetailed = -1 // 流水减一
 				itemBill.RegisterPlatform = 1
 				itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+				itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 				itemBill.AdminId = AdminUser.AdminId
 
 				if totalAll == 0 {
@@ -532,6 +533,7 @@ func (this *ActivitySpecialTripCoAntroller) TripCancel() {
 	itemBill.BillDetailed = 1 // 流水加一
 	itemBill.RegisterPlatform = 1
 	itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+	itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 	itemBill.AdminId = sysUser.AdminId
 	resultTime := utils.StrTimeToTime(activityInfo.ActivityTime)
 	//48小时之内的取消也扣除一次参会记录
@@ -790,6 +792,7 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 				itemBill.BillDetailed = 1 // 流水加一
 				itemBill.RegisterPlatform = 1
 				itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+				itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 				itemBill.AdminId = AdminUser.AdminId
 				itemBill.Way = 2
 				userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)
@@ -847,6 +850,7 @@ func (this *ActivitySpecialTripCoAntroller) MeetingDo() {
 			itemBill.BillDetailed = -1 // 流水减一
 			itemBill.RegisterPlatform = 1
 			itemBill.ChartPermissionId = activityInfo.ChartPermissionId
+			itemBill.ChartPermissionName = activityInfo.ChartPermissionName
 			itemBill.AdminId = AdminUser.AdminId
 			itemBill.Way = 2
 			userType, tripRemaining, mapChartName, err := cygxService.GetChartPermissionSpecialSurplusByCompany(v.CompanyId)

models/cygx/activity_special_trip_bill.go

@@ -6,24 +6,25 @@ import (
 )
 
 type CygxActivitySpecialTripBill struct {
-	Id                int       `orm:"column(id);pk"`
+	Id                  int       `orm:"column(id);pk"`
-	UserId            int       `description:"用户id,多个用,隔开"`
+	UserId              int       `description:"用户id,多个用,隔开"`
-	ActivityId        int       `description:"活动ID"`
+	ActivityId          int       `description:"活动ID"`
-	CreateTime        time.Time `description:"创建时间"`
+	CreateTime          time.Time `description:"创建时间"`
-	Mobile            string    `description:"手机号"`
+	Mobile              string    `description:"手机号"`
-	Email             string    `description:"邮箱号"`
+	Email               string    `description:"邮箱号"`
-	CompanyId         int       `description:"公司ID"`
+	CompanyId           int       `description:"公司ID"`
-	CompanyName       string    `description:"公司名称"`
+	CompanyName         string    `description:"公司名称"`
-	RealName          string    `description:"用户实际名称"`
+	RealName            string    `description:"用户实际名称"`
-	AdminId           int       `description:"销售/管理员ID"`
+	AdminId             int       `description:"销售/管理员ID"`
-	Source            int       `description:"来源，1小程序，2后台添加, 3开发人员手动添加"`
+	Source              int       `description:"来源，1小程序，2后台添加, 3开发人员手动添加"`
-	BillDetailed      int       `description:"流水明细，判断是进账还是出账"`
+	BillDetailed        int       `description:"流水明细，判断是进账还是出账"`
-	DoType            int       `description:"操作方式，1报名，2取消报名"`
+	DoType              int       `description:"操作方式，1报名，2取消报名"`
-	RegisterPlatform  int       `description:"来源 1小程序，2：网页"`
+	RegisterPlatform    int       `description:"来源 1小程序，2：网页"`
-	ChartPermissionId int       `description:"行业id"`
+	ChartPermissionId   int       `description:"行业id"`
-	Way               int       `description:"1报名，取消报名。2到会取消到会 3转正或清零 4取消活动"`
+	ChartPermissionName string    `description:"行业名称"`
-	Content           string    `description:"内容"`
+	Way                 int       `description:"1报名，取消报名。2到会取消到会 3转正或清零 4取消活动"`
-	Total             string    `description:"总和"`
+	Content             string    `description:"内容"`
+	Total               string    `description:"总和"`
 }
 
 type CygxActivitySpecialTripBillList struct {

services/cygx/activity_special.go

@@ -441,11 +441,11 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
 			return
 		}
-		// 获取继承点数
+		//// 获取继承点数
-		inheritList, e := cygx.GetCygxActivitySpecialInheritPointsByCompanyId(companyId)
+		//inheritList, e := cygx.GetCygxActivitySpecialInheritPointsByCompanyId(companyId)
-		if e != nil && e.Error() != utils.ErrNoRow() {
+		//if e != nil && e.Error() != utils.ErrNoRow() {
-			err = errors.New("GetCygxActivitySpecialInheritPointsByCompanyId, Err: " + e.Error())
+		//	err = errors.New("GetCygxActivitySpecialInheritPointsByCompanyId, Err: " + e.Error())
-		}
+		//}
 		if userType == 2 {
 
 			var tripBillNum int
@@ -455,13 +455,13 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 				//}
 				tripBillNum += v.BillDetailed
 			}
-			if len(inheritList) > 0 {
+			//if len(inheritList) > 0 {
-				for _, v := range inheritList {
+			//	for _, v := range inheritList {
-					if v.ChartPermissionId == 0 {
+			//		if v.ChartPermissionId == 0 {
-						tripBillNum += v.Points
+			//			tripBillNum += v.Points
-					}
+			//		}
-				}
+			//	}
-			}
+			//}
 
 			tripRemaining = tripBillNum
 			if tripRemaining < 0 {
@@ -517,9 +517,9 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 				}
 			}
 			// 通过继承获得的加点
-			for _, v := range inheritList {
+			//for _, v := range inheritList {
-				mapInheritChartName[v.ChartPermissionName] = v.Points
+			//	mapInheritChartName[v.ChartPermissionName] = v.Points
-			}
+			//}
 			for k, _ := range chartNameMap {
 				if _, ok := mapChartName[k]; ok {
 					if inherit, ok2 := mapInheritChartName[k]; ok2 {
@@ -556,7 +556,7 @@ func ActivitySpecialCompanyApproval(companyId int, companyName string) (err erro
 	itemBill.Source = 2
 	itemBill.DoType = 2
 	itemBill.Way = 3
-	if userType == 2{
+	if userType == 2 {
 		packageTypeMap := map[int]int{1: 16, 2: 10}
 		totalTrip := packageTypeMap[packageType]
 		if len(inheritList) > 0 {
@@ -685,7 +685,7 @@ func GetSpecialSurplusByCompanyNew(companyId int) (specialSurplus string, err er
 	//chartMap := map[int]string{utils.YI_YAO_ID:utils.YI_YAO_NAME, utils.XIAO_FEI_ID:utils.XIAO_FEI_NAME, utils.KE_JI_ID:utils.KE_JI_NAME, utils.ZHI_ZAO_ID:utils.ZHI_ZAO_NAME}
 	//chartNumMap := map[int]int{utils.YI_YAO_ID:0, utils.XIAO_FEI_ID:0, utils.KE_JI_ID:0, utils.ZHI_ZAO_ID:0}
 	if companyDetail.Status == "正式" {
-		billItem,e := cygx.GetCygxActivitySpecialTripBillByCompanyId(companyId)
+		billItem, e := cygx.GetCygxActivitySpecialTripBillByCompanyId(companyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = e
 			return
@@ -696,4 +696,4 @@ func GetSpecialSurplusByCompanyNew(companyId int) (specialSurplus string, err er
 		return
 	}
 	return
-}
+}