xingzai 10 miesięcy temu
rodzic
commit
fec1d8dec6
2 zmienionych plików z 17 dodań i 1 usunięć
  1. 17 0
      services/activity.go
  2. 0 1
      services/article.go

+ 17 - 0
services/activity.go

@@ -1308,6 +1308,7 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 	var companyDetailStatus string
 	var userTypeStr string
 	userId := user.UserId
+	activityId := activityInfo.ActivityId
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
 	//勾选【研选扣点】且扣点对象为参会人的活动,需要有买方研选的正式权限
 	if strings.Contains(activityInfo.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) && activityPointsByUserAllMap[activityInfo.ActivityId] {
@@ -1320,6 +1321,22 @@ func GetActivityDetailUserPower(user *models.WxUserItem, activityInfo *models.Ac
 		havePower = true
 		return
 	}
+
+	if (!activityInfo.IsResearchPoints && activityInfo.IsLimitPeople == 0) || activityInfo.YidongActivityId != "" { //易董的活动 或者(不扣点且不限制人数)走月卡日卡逻辑
+		//用户是否持有有效卡片
+		userCardTotal := GetCygxOrderUserCardTotal(user.Mobile)
+		if userCardTotal == 1 {
+			havePower = true
+			return
+		}
+	} else {
+		activtyPayTotal := GetCygxOrderVirtualAssetdCountTotal(user.Mobile, activityId)
+		if activtyPayTotal == 1 {
+			havePower = true
+			return
+		}
+	}
+
 	userType, permissionStr, permissionStrZhengShi, e := GetUserTypeZhengShi(user.CompanyId)
 	if e != nil {
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())

+ 0 - 1
services/article.go

@@ -671,7 +671,6 @@ func GetArticleDetailUserPower(user *models.WxUserItem, articleInfo *models.Arti
 
 	//用户是否持有有效卡片
 	userCardTotal := GetCygxOrderUserCardTotal(user.Mobile)
-	fmt.Println("userCardTotal", userCardTotal)
 	if userCardTotal == 1 {
 		havePower = true
 		return