no message

models/company/company_permission.go

@@ -202,6 +202,13 @@ func GetPermissionLookItems(productId int, classifyName string) (items []*Permis
 	return
 }
 
+func GetPermissionLookItemsRai(productId int, classifyName string) (items []*PermissionLookItem, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id > 0 AND cygx_auth =1  ORDER BY sort ASC `
+	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
+	return
+}
+
 func GetPermissionLookItems2(productId int, classifyName string) (items []*PermissionLookItem, err error) {
 	o := orm.NewOrm()
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? AND parent_id>0 AND permission_type!=2 ORDER BY sort ASC `

models/cygx/activity_special_trip_bill.go

@@ -99,7 +99,7 @@ type CygxActivitySpecialTripBillDetailList struct {
 	RealName            string    `description:"用户实际名称"`
 	AdminId             int       `description:"销售/管理员ID"`
 	Source              int       `description:"来源，1小程序，2后台添加, 3开发人员手动添加"`
-	BillDetailed        int       `description:"流水明细，判断是进账还是出账"`
+	BillDetailed        float64   `description:"流水明细，判断是进账还是出账"`
 	DoType              int       `description:"操作方式，1报名，2取消报名"`
 	RegisterPlatform    int       `description:"来源 1小程序，2：网页"`
 	ChartPermissionId   int       `description:"行业id"`
@@ -110,17 +110,17 @@ type CygxActivitySpecialTripBillDetailList struct {
 }
 
 type CygxActivitySpecialPointsBillRespItem struct {
-	Id                  int    `gorm:"column:id;primary_key;AUTO_INCREMENT"`
-	Content             string `gorm:"column:content" `                                 // 内容说明
-	Total               string `gorm:"column:points;default:0;NOT NULL" `               // 合计
-	CreateTime          string `gorm:"column:create_time" `                             // 创建时间
-	CompanyId           int    `gorm:"column:company_id;default:0" `                    // 公司ID
-	CompanyName         string `gorm:"column:company_name" `                            // 公司名称
-	RealName            string `gorm:"column:real_name"`                                // 用户实际名称
-	BillDetailed        int    `gorm:"column:bill_detailed;default:0;NOT NULL" json:""` // 流水明细，判断是进账还是出账
-	ActivityName        string `description:"活动标题"`
-	ChartPermissionId   int    `description:"行业id"`
-	ChartPermissionName string `description:"行业名称"`
+	Id                  int     `gorm:"column:id;primary_key;AUTO_INCREMENT"`
+	Content             string  `gorm:"column:content" `                                 // 内容说明
+	Total               string  `gorm:"column:points;default:0;NOT NULL" `               // 合计
+	CreateTime          string  `gorm:"column:create_time" `                             // 创建时间
+	CompanyId           int     `gorm:"column:company_id;default:0" `                    // 公司ID
+	CompanyName         string  `gorm:"column:company_name" `                            // 公司名称
+	RealName            string  `gorm:"column:real_name"`                                // 用户实际名称
+	BillDetailed        float64 `gorm:"column:bill_detailed;default:0;NOT NULL" json:""` // 流水明细，判断是进账还是出账
+	ActivityName        string  `description:"活动标题"`
+	ChartPermissionId   int     `description:"行业id"`
+	ChartPermissionName string  `description:"行业名称"`
 }
 
 type CygxActivitySpecialPointsBillResp struct {

services/company_permission.go

@@ -24,7 +24,7 @@ func RaiCompanyPermissionAndCheckList(companyId int, unify bool, filterPermissio
 	checkList := make([]int, 0) // 客户拥有的权限, 用于前端匹配权限列表回显
 
 	// 获取权益权限列表
-	permissionItems, e := company.GetPermissionLookItems(productId, productName)
+	permissionItems, e := company.GetPermissionLookItemsRai(productId, productName)
 	if e != nil {
 		err = errors.New("获取权益权限列表失败, Err: " + e.Error())
 		return

services/cygx/activity_power_check.go

@@ -532,6 +532,14 @@ func GetSpecialDetailUserPower(user *models.WxUser, activityInfo *cygx.ActivityS
 		havePower = true
 		return
 	}
+	userPointsNum, e := cygx.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
+		return
+	}
+	if userPointsNum > 0 {
+		return
+	}
 	userType, _, permissionStr, _, e := GetUserType(user.CompanyId)
 	if e != nil {
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
@@ -554,22 +562,22 @@ func GetSpecialDetailUserPower(user *models.WxUser, activityInfo *cygx.ActivityS
 			return
 		}
 	}
-	permissionShengji, errs := cygx.GetCompanyPermissionByUserTrip(user.CompanyId)
-	if errs != nil {
-		err = errs
-		return
-	}
+	//permissionShengji, errs := cygx.GetCompanyPermissionByUserTrip(user.CompanyId)
+	//if errs != nil {
+	//	err = errs
+	//	return
+	//}
 	//如果有升级权限的自动添加策略、固收的升级权限
 	if permissionStr != "" {
 		if activityInfo.ChartPermissionName == utils.CE_LUE_NAME {
-			permissionShengji += "," + utils.CE_LUE_NAME
+			permissionStr += "," + utils.CE_LUE_NAME
 		}
 		if activityInfo.ChartPermissionName == utils.GU_SHOU_NAME {
-			permissionShengji += "," + utils.GU_SHOU_NAME
+			permissionStr += "," + utils.GU_SHOU_NAME
 		}
 	}
 	//如果没有对应的升级权限，则返回
-	if !strings.Contains(permissionShengji, activityInfo.ChartPermissionName) {
+	if !strings.Contains(permissionStr, activityInfo.ChartPermissionName) {
 		return
 	}
 
@@ -592,7 +600,7 @@ func GetSpecialDetailUserPower(user *models.WxUser, activityInfo *cygx.ActivityS
 		return
 	}
 
-	if strings.Contains(permissionShengji, activityInfo.ChartPermissionName) && strings.Contains(activityInfo.CustomerTypeIds, "8") {
+	if strings.Contains(permissionStr, activityInfo.ChartPermissionName) && strings.Contains(activityInfo.CustomerTypeIds, "8") {
 		havePower = true
 		return
 	}

services/cygx/activity_signup.go

@@ -432,12 +432,12 @@ func CheckActivityPoints(activityInfo *cygx.ActivityDetail, wxUser *models.WxUse
 	if activityInfo.IsResearchPoints == 1 {
 		//获取活动对用户要扣的点
 		userPointsNum, e := cygx.GetCygxActivityPointsSetUserNum(activityInfo.ActivityId)
-		if e != nil {
+		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCygxActivityPointsSetUserNum, Err: " + e.Error())
 			return
 		}
 		// 获取用户所在公司剩余的点
-		companyPointsNum, e := cygx.GetCompanyPoints(wxUser.CompanyId)
+		companyPointsNum, e := cygx.GetCygxActivitySpecialPermissionPointsCount(wxUser.CompanyId)
 		if e != nil && e.Error() != utils.ErrNoRow() {
 			err = errors.New("GetCompanyPoints, Err: " + e.Error())
 			return