Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
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
db89224a
authored
Mar 19, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_fake_data_20180319' into 'master'
调整竞调数据 See merge request
!17
parents
a33fc8b2
aad19b6b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
7 deletions
app/Http/Controllers/OrderController.php
app/Http/Controllers/OrderController.php
View file @
db89224a
...
@@ -246,9 +246,7 @@ Class OrderController extends Controller
...
@@ -246,9 +246,7 @@ Class OrderController extends Controller
}
}
// 竞调账号
// 竞调账号
if
(
$info
[
'username'
]
==
'vpadmin@ichunt.com'
)
{
if
(
$info
[
'username'
]
!=
'vpadmin@ichunt.com'
)
{
$map
[
'is_fake'
]
=
1
;
}
else
{
$map
[
'is_fake'
]
=
0
;
$map
[
'is_fake'
]
=
0
;
}
}
...
@@ -306,10 +304,8 @@ Class OrderController extends Controller
...
@@ -306,10 +304,8 @@ Class OrderController extends Controller
/* 查看ERP订单 */
/* 查看ERP订单 */
$map
[
'offline_order'
]
=
[
2
,
3
];
// 2-ERP, 3-JD
$map
[
'offline_order'
]
=
[
2
,
3
];
// 2-ERP, 3-JD
// 竞调账号
// 非竞调账号,则查看真实数据
if
(
$info
[
'username'
]
==
'vpadmin@ichunt.com'
)
{
if
(
$info
[
'username'
]
!=
'vpadmin@ichunt.com'
)
{
$map
[
'is_fake'
]
=
1
;
}
else
{
$map
[
'is_fake'
]
=
0
;
$map
[
'is_fake'
]
=
0
;
}
}
...
...
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