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
3831d2f5
Commit
3831d2f5
authored
Aug 10, 2021
by
luhongguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:编辑拼单活动
parent
9285b85a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
Marketing.php
application/models/marketing/mysql/Marketing.php
+0
-4
GoodsService.php
application/services/goods/GoodsService.php
+1
-1
MarketingService.php
application/services/marketing/MarketingService.php
+10
-1
No files found.
application/models/marketing/mysql/Marketing.php
View file @
3831d2f5
...
...
@@ -28,10 +28,6 @@ class Marketing extends MysqlBase
const
COMMISSION_MODE_RATE
=
1
;
const
COMMISSION_MODE_FIXED
=
2
;
const
ONLINE_STATUS_OPEN
=
1
;
const
ONLINE_STATUS_STOP
=
2
;
const
ONLINE_STATUS_EXPIRE
=
3
;
public
static
function
getRecord
(
$where
,
$colums
=
[])
{
if
(
empty
(
$colums
))
{
...
...
application/services/goods/GoodsService.php
View file @
3831d2f5
...
...
@@ -750,7 +750,7 @@ class GoodsService
$marketings
=
Marketing
::
select
(
"*"
,
[
"marketing_id"
=>
$marketingIds
,
"marketing_type"
=>
Marketing
::
MARKETING_TYPE_FENXIAO
,
"online_status"
=>
Marketing
::
ONLINE_STATUS_
OPEN
]
"online_status"
=>
Marketing
::
ONLINE_STATUS_
QIDONG
]
);
if
(
!
empty
(
$marketings
))
{
...
...
application/services/marketing/MarketingService.php
View file @
3831d2f5
...
...
@@ -681,11 +681,20 @@ class MarketingService
$maxPrice
=
end
(
$uniquePriceList
);
Marketing
::
beginTransaction
();
$onlineStatus
=
Marketing
::
ONLINE_STATUS_DAOQI
;
if
(
$params
[
"online_status"
]
==
Marketing
::
ONLINE_STATUS_QIDONG
)
{
$onlineStatus
=
Marketing
::
ONLINE_STATUS_QIDONG
;
$endTime
=
date
(
"Y-m-d H:i:s"
,
strtotime
(
"+7 day"
));
}
if
(
$params
[
"online_status"
]
==
Marketing
::
ONLINE_STATUS_GUANBI
)
{
$onlineStatus
=
Marketing
::
ONLINE_STATUS_GUANBI
;
$endTime
=
date
(
"Y-m-d H:i:s"
);
}
$marketingParams
=
[
'marketing_name'
=>
$marketingName
,
'start_time'
=>
$startTime
,
'end_time'
=>
$endTime
,
'online_status'
=>
1
,
'online_status'
=>
$onlineStatus
,
'marketing_type'
=>
$type
,
'good_count'
=>
count
(
$goodsSkuId
),
'update_user_email'
=>
$createUserEmail
,
...
...
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