Browse Source

no message

xingzai 2 years ago
parent
commit
4cd0e14abd
2 changed files with 23 additions and 2 deletions
  1. 1 1
      controllers/activity.go
  2. 22 1
      services/activity_special.go

+ 1 - 1
controllers/activity.go

@@ -2733,7 +2733,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码,从1开始"
 // @Success 200 {object} models.GetCygxActivitySpecialDetailListResp
-// @router /special/list [get]
+// @router /special/del_list [get]
 func (this *ActivityCoAntroller) SpecialList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

+ 22 - 1
services/activity_special.go

@@ -352,7 +352,7 @@ func GetActivityLabelSpecialConfirmList(user *models.WxUserItem, startSize, page
 		return
 	}
 	var conditionOr string
-	if permissionShengji != "" && userType != 2 {
+	if permissionShengji != "" {
 		slicePerShengji := strings.Split(permissionShengji, ",")
 		permissionShengji = ""
 		for _, v := range slicePerShengji {
@@ -795,7 +795,28 @@ func GetSpecialDetailUserPower(user *models.WxUserItem, activityInfo *models.Cyg
 	}
 	if total == 1 {
 		havePower = true
+		return
+	}
+
+	// 8: 行业升级套餐客户:该活动对应行业为升级权限的客户
+	permissionShengji, errs := models.GetCompanyPermissionByUserZhengShiTrip(user.CompanyId)
+	if errs != nil {
+		err = errs
+		return
+	}
+
+	if permissionShengji != "" {
 	}
+
+	//9:其他行业正式客户:前述所有正式客户以外的正式客户 查询处理
+	permissionZhengShiStr, errs := models.GetCompanyPermissionByUserZhengShi(user.CompanyId)
+	if errs != nil {
+		err = errs
+		return
+	}
+	if permissionZhengShiStr != "" && userType == 9 {
+	}
+
 	return
 }