Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄成意
/
go_sku_server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
41557e54
authored
Jan 21, 2021
by
mushishixian
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
bug
parent
077d29d0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
service/service_activity.go
service/service_activity.go
View file @
41557e54
...
@@ -68,8 +68,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
...
@@ -68,8 +68,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
if
as
.
CheckExcludeSku
(
checkData
.
GoodsId
,
activity
)
||
as
.
CheckExcludeBrand
(
checkData
.
BrandId
,
activity
)
{
if
as
.
CheckExcludeSku
(
checkData
.
GoodsId
,
activity
)
||
as
.
CheckExcludeBrand
(
checkData
.
BrandId
,
activity
)
{
hasActivity
=
false
continue
goto
INFO
}
}
//判断是否是搞活动的品牌
//判断是否是搞活动的品牌
...
@@ -108,8 +107,8 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
...
@@ -108,8 +107,8 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
UserScope
:
activity
.
UserScope
,
UserScope
:
activity
.
UserScope
,
},
},
}
}
break
}
}
break
}
}
return
return
...
@@ -134,8 +133,7 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
...
@@ -134,8 +133,7 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
//判断是否是排除的sku或者品牌,如果是的话,直接返回没活动
if
as
.
CheckExcludeSku
(
checkData
.
GoodsId
,
activity
)
||
as
.
CheckExcludeBrand
(
checkData
.
BrandId
,
activity
)
{
if
as
.
CheckExcludeSku
(
checkData
.
GoodsId
,
activity
)
||
as
.
CheckExcludeBrand
(
checkData
.
BrandId
,
activity
)
{
hasActivity
=
false
continue
goto
INFO
}
}
//如果是专卖,则要去判断canal,如果是自营,则去判断分类
//如果是专卖,则要去判断canal,如果是自营,则去判断分类
...
@@ -191,8 +189,8 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
...
@@ -191,8 +189,8 @@ func (as *ActivityService) GetPriceActivity(checkData model.ActivityCheckData, a
UserScope
:
activity
.
UserScope
,
UserScope
:
activity
.
UserScope
,
},
},
}
}
break
}
}
break
}
}
priceActivity
.
HasActivity
=
hasActivity
priceActivity
.
HasActivity
=
hasActivity
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment