|
@@ -269,8 +269,8 @@ func DeductTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
|
|
|
condition = " AND company_id = ? AND points > 0 ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId)
|
|
|
|
|
|
- //判断是不是策略行业的活动,如果不是策略就获取对应行业的点数 ,策略的任何一个行业有剩余点数都能参加
|
|
|
- if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
+ //判断是不是策略、固收行业的活动,如果不是策略就获取对应行业的点数 ,策略的任何一个行业有剩余点数都能参加
|
|
|
+ if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = " AND company_id = ? AND ( chart_permission_id = ? OR chart_permission_id =0 ) AND points > 0 ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|
|
@@ -308,8 +308,8 @@ func RebateTripRemainingtimesByUser(user *models.WxUserItem, activityInfo *model
|
|
|
condition = " AND company_id = ? ORDER BY points DESC LIMIT 1 "
|
|
|
pars = append(pars, companyId)
|
|
|
|
|
|
- //判断是不是策略行业的活动,如果不是策略就获取对应行业的点数 ,策略的任何一个行业有剩余点数都能参加
|
|
|
- if chartPermissionName != utils.CE_LUE_NAME {
|
|
|
+ //判断是不是策略、固收行业的活动,如果不是策略就获取对应行业的点数 ,策略的任何一个行业有剩余点数都能参加
|
|
|
+ if chartPermissionName != utils.CE_LUE_NAME && chartPermissionName != utils.GU_SHOU_NAME {
|
|
|
pars = make([]interface{}, 0)
|
|
|
condition = " AND company_id = ? AND (chart_permission_id = ? OR chart_permission_id = 0 ) LIMIT 1 "
|
|
|
pars = append(pars, companyId, activityInfo.ChartPermissionId)
|