no message

models/order/order_virtual_asset.go

@@ -106,7 +106,7 @@ func GetCygxOrderVirtualAssetActivityList(sourceIds []int, mobile string) (items
 	sql := `SELECT source_id
 			FROM
 			cygx_order_virtual_asset
-			WHERE  1=1 AND    source = 'activity'  mobile= ? AND  source_id  IN (` + utils.GetOrmInReplace(lenArr) + `)  `
+			WHERE  1=1 AND    source = 'activity'   AND  mobile= ? AND  source_id  IN (` + utils.GetOrmInReplace(lenArr) + `)  `
 	_, err = o.Raw(sql, mobile, sourceIds).QueryRows(&items)
 	return
 }

services/activity.go

@@ -886,29 +886,39 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 }
 
 func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserItem, permissionArr []string) (itemsActivity []*models.ActivityListResp) {
-
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg(fmt.Sprint("获取用户十分钟之内是否有相同的文章订单信息失败 GetHaverEquallyOrderByUser10MinByArticle, err：", err.Error()), 2)
+		}
+	}()
 	var activityIds []int
 	userPermissionCode, e := GetUserPermissionCode(user.UserId, user.CompanyId)
 	if e != nil {
-		e = errors.New("获取用户权限失败, userPermissionCode Err: " + e.Error())
+		err = errors.New("获取用户权限失败, userPermissionCode Err: " + e.Error())
 		return
 	}
 	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 	if e != nil {
-		e = errors.New("获取用户权限失败, Err: " + e.Error())
+		err = errors.New("获取用户权限失败, Err: " + e.Error())
 		return
 	}
 	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
 
+	for _, v := range items {
+		activityIds = append(activityIds, v.ActivityId)
+	}
 	virtualAssetActivityList, e := order.GetCygxOrderVirtualAssetActivityList(activityIds, user.Mobile) // 获取用户购买的单场活动信息
 	if e != nil {
-		e = errors.New("GetCygxOrderVirtualAssetActivityList, Err: " + e.Error())
+		err = errors.New("GetCygxOrderVirtualAssetActivityList, Err: " + e.Error())
 		return
 	}
 	virtualAssetActivityIds := make(map[int]bool)
 	for _, v := range virtualAssetActivityList {
 		virtualAssetActivityIds[v.SourceId] = true
 	}
+
 	userCardTotal := GetCygxOrderUserCardTotal(user.Mobile) //用户是否持有有效卡片
 
 	for _, activityDetail := range items {
@@ -1126,11 +1136,7 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 		au.SellerMobile = authInfo.SellerMobile
 		au.HasPermission = authInfo.HasPermission
 		au.OperationMode = authInfo.OperationMode
-		if au.HasPermission == 1 {
-			// 非宏观权限进一步判断是否有权限
-			if v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
-				au.HasPermission = userPermissionCode
-			}
+		if au.HasPermission != 1 {
 			//如果是易董的活动，主、副权限有一个满足即可 查研观向 11.0
 			if v.YidongActivityId != "" {
 				if utils.InArrayByStr(permissionArr, v.ChartPermissionName) || utils.InArrayByStr(permissionArr, v.ChartPermissionNameDeputy) {
@@ -1147,6 +1153,13 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 			}
 		}
 
+		if au.HasPermission != 1 {
+			// 非宏观权限进一步判断是否有权限
+			if v.ChartPermissionId != utils.HONG_GUAN_ID && !utils.InArrayByStr(permissionArr, v.ChartPermissionName) {
+				au.HasPermission = userPermissionCode
+			}
+		}
+
 		// 无权限的弹框提示
 		if au.HasPermission != 1 {
 			au.HasPermission = userPermissionCode
@@ -1172,26 +1185,26 @@ func ActivityArrButtonShow(items []*models.ActivityDetail, user *models.WxUserIt
 		}
 		itemActivity.AuthInfo = au
 		//处理用户已经报名了的行程
-		activityIds = append(activityIds, v.ActivityId)
+		//activityIds = append(activityIds, v.ActivityId)
 		itemsActivity = append(itemsActivity, itemActivity)
 	}
 
-	//处理专项调研
-	UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
-	if e != nil {
-		e = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
-		return
-	}
-	for _, v := range itemsActivity {
-		if _, ok := UserMap[v.ActivityId]; ok {
-			v.IsTrip = 1
-		}
-		if v.Days == 0 {
-			v.TripStatus = 1
-		} else {
-			v.TripStatus = 2
-		}
-	}
+	////处理专项调研
+	//UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
+	//if e != nil {
+	//	err = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
+	//	return
+	//}
+	//for _, v := range itemsActivity {
+	//	if _, ok := UserMap[v.ActivityId]; ok {
+	//		v.IsTrip = 1
+	//	}
+	//	if v.Days == 0 {
+	//		v.TripStatus = 1
+	//	} else {
+	//		v.TripStatus = 2
+	//	}
+	//}
 	return
 }