no message

models/activity_points_set.go

@@ -6,15 +6,16 @@ import (
 )
 
 type YanXuanActivityPointsRedis struct {
-	UserId           int       `description:"用户ID"`
-	ComapnyId        int       `description:"公司ID"`
-	ActivityId       int       `description:"活动ID"`
-	PublishStatus    int       `description:"发布状态 1已发布，0未发布"`
-	SourceType       int       `description:"1：报名、 2：取消报名、3：活动编辑、4：活动发布，取消发布、5：活动到会。"`
-	AdminId          int       `description:"管理员、销售ID"`
-	Source           int       `description:" 来源，1客户端，2后台添加, 3开发人员手动添加、4定时任务"`
-	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
-	CreateTime       time.Time `description:"创建时间"`
+	UserId            int       `description:"用户ID"`
+	ComapnyId         int       `description:"公司ID"`
+	CompanyContractId int       `description:"合同id"`
+	ActivityId        int       `description:"活动ID"`
+	PublishStatus     int       `description:"发布状态 1已发布，0未发布"`
+	SourceType        int       `description:"1：报名、 2：取消报名、3：活动编辑、4：活动发布，取消发布、5：活动到会。"`
+	AdminId           int       `description:"管理员、销售ID"`
+	Source            int       `description:" 来源，1客户端，2后台添加, 3开发人员手动添加、4定时任务"`
+	RegisterPlatform  int       `description:"来源 1小程序，2：网页"`
+	CreateTime        time.Time `description:"创建时间"`
 }
 
 type CygxActivityPointsSet struct {

services/activity_points.go

@@ -889,6 +889,7 @@ func YanXuanCompanyApprovalReduce(log models.YanXuanActivityPointsRedis) (err er
 		}
 	}()
 	comapnyId := log.ComapnyId
+	companyContractId := log.CompanyContractId
 
 	comapnyDetail, e := models.GetCompanyById(comapnyId)
 	if e != nil {
@@ -904,51 +905,54 @@ func YanXuanCompanyApprovalReduce(log models.YanXuanActivityPointsRedis) (err er
 	//查询研选的权限状态
 	var condition string
 	var pars []interface{}
-	condition += " AND company_id = ? AND status = ? AND chart_permission_id = ?   ORDER BY company_report_permission_id DESC LIMIT 1  "
-	pars = append(pars, comapnyId, "正式", utils.CHART_PERMISSION_ID_YANXUAN)
-	companyReportPermissionDetail, e := models.GetCompanyReportPermissionDetailByCondition(condition, pars)
+	condition += " AND company_id = ? AND company_contract_id =?  AND chart_permission_id = ?   ORDER BY id DESC LIMIT 1  "
+	pars = append(pars, comapnyId, companyContractId, utils.YAN_XUAN_KOU_DIAN_BAO_ID)
+	companyPointDetail, e := company.GetCompanyContractPermissionDetail(condition, pars)
 	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCompanyPoints, Err: " + e.Error())
+		err = errors.New("GetCompanyContractPermissionDetail, Err: " + e.Error())
 		return
 	}
-	if companyReportPermissionDetail == nil {
+	if companyPointDetail == nil {
 		return // 如果不存在就不做研选扣点处理
 	}
 
 	//获取最近的一条审批合同信息
-	newCompanyApprovalDetail, e := company.GetCompanyApprovalById(comapnyId)
-	if e != nil && e.Error() != utils.ErrNoRow() {
-		err = errors.New("GetCompanyApprovalById, Err: " + e.Error())
-		return
-	}
-	if newCompanyApprovalDetail == nil {
-		return
-	}
-	companyContractId := newCompanyApprovalDetail.CompanyContractId
-
-	totalYxPerminssion, e := company.GetCompanyContractPermissionCheck(companyContractId, utils.CHART_PERMISSION_ID_YANXUAN)
-	if e != nil {
-		err = errors.New("GetCompanyContractPermissionCheck, Err: " + e.Error())
-		return
-	}
-	// 如果最新的审批合同里没有研选的权限，那么就不做处理
-	if totalYxPerminssion == 0 {
-		return
-	}
+	//newCompanyApprovalDetail, e := company.GetCompanyApprovalById(comapnyId)
+	//if e != nil && e.Error() != utils.ErrNoRow() {
+	//	err = errors.New("GetCompanyApprovalById, Err: " + e.Error())
+	//	return
+	//}
+	//if newCompanyApprovalDetail == nil {
+	//	return
+	//}
+	//companyContractId := newCompanyApprovalDetail.CompanyContractId
+
+	//totalYxPerminssion, e := company.GetCompanyContractPermissionCheck(companyContractId, utils.CHART_PERMISSION_ID_YANXUAN)
+	//if e != nil {
+	//	err = errors.New("GetCompanyContractPermissionCheck, Err: " + e.Error())
+	//	return
+	//}
+	//// 如果最新的审批合同里没有研选的权限，那么就不做处理
+	//if totalYxPerminssion == 0 {
+	//	return
+	//}
 
 	var billDetailed float64
 	var content string
 	//ExpensiveYx               int       `description:"权益研选: 0->3w; 1->5w；2->10W"` 3W3次、5W 15次，20w:40次 ,
-	if companyReportPermissionDetail.ExpensiveYx == 1 {
-		billDetailed = 15
-		content = "买方研选(5W)转正"
-	} else if companyReportPermissionDetail.ExpensiveYx == 2 {
-		billDetailed = 40
-		content = "买方研选(10w)转正"
-	} else {
-		billDetailed = 3
-		content = "买方研选(3W)转正"
-	}
+	//if companyReportPermissionDetail.ExpensiveYx == 1 {
+	//	billDetailed = 15
+	//	content = "买方研选(5W)转正"
+	//} else if companyReportPermissionDetail.ExpensiveYx == 2 {
+	//	billDetailed = 40
+	//	content = "买方研选(10w)转正"
+	//} else {
+	//	billDetailed = 3
+	//	content = "买方研选(3W)转正"
+	//}
+
+	billDetailed = companyPointDetail.Points
+	content = "签约研选扣点包"
 
 	//获取需要添加的流水信息
 	var items []*models.CygxActivityPointsBill
@@ -1031,7 +1035,7 @@ func YanXuanCompanyCompanyTryOutReduce(log models.YanXuanActivityPointsRedis) (e
 	item.Source = log.Source
 	//item.ChartPermissionId = activityInfo.ChartPermissionId
 	item.DoType = 2
-	item.Content = "到期清零"
+	item.Content = "研选扣点包到期清零"
 	item.Points = 0
 	items = append(items, item)