Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
goods
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
goods
Commits
49fb8076
Commit
49fb8076
authored
Aug 07, 2021
by
jianghaiming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jielong' of
https://gitlab.yidian-inc.com/bp/goods
into jielong
parents
fa7847be
93de3db2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
GoodsSpu.php
application/models/goods/mysql/GoodsSpu.php
+3
-0
MarketingPindanGoodsService.php
application/services/goods/MarketingPindanGoodsService.php
+1
-0
No files found.
application/models/goods/mysql/GoodsSpu.php
View file @
49fb8076
...
...
@@ -27,6 +27,9 @@ class GoodsSpu extends MysqlBase
const
BELONG_TYPE_DISANFANG
=
1
;
//第三方商品
const
BELONG_TYPE_ZIYING
=
2
;
//自营商品
const
CAN_SHOW_ES_YES
=
1
;
const
CAN_SHOW_ES_NO
=
2
;
public
static
function
getRecord
(
$where
,
$colums
=
[])
{
if
(
empty
(
$colums
))
{
...
...
application/services/goods/MarketingPindanGoodsService.php
View file @
49fb8076
...
...
@@ -131,6 +131,7 @@ class MarketingPindanGoodsService
"goods_sub_type"
=>
empty
(
$spuData
[
"goods_sub_type"
])
?
GoodsSpu
::
SUB_TYPE_INSTANT
:
$spuData
[
"goods_sub_type"
],
"belong_type"
=>
empty
(
$spuData
[
"belong_type"
])
?
GoodsSpu
::
BELONG_TYPE_DISANFANG
:
$spuData
[
"belong_type"
],
"goods_sale_type"
=>
empty
(
$spuData
[
"setmeal"
])
?
GoodsSpu
::
SALE_TYPE_NO_COMBINATION
:
GoodsSpu
::
SALE_TYPE_COMBINATION
,
"can_show_es"
=>
GoodsSpu
::
CAN_SHOW_ES_NO
,
];
GoodsSpu
::
save
(
$spuParams
);
return
$spuParams
;
...
...
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