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
600874a7
authored
Sep 29, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_order_20200923'
parents
bcf38fa6
55fa7523
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
app/Http/Controllers/OrderController.php
config/config.php
app/Http/Controllers/OrderController.php
View file @
600874a7
...
...
@@ -2166,10 +2166,18 @@ Class OrderController extends Controller
$tmp
[
'material'
]
=
$value
[
'material_number'
];
$tmp
[
'purchasing'
]
=
!
empty
(
$value
[
'buyerName'
])
?
$value
[
'buyerName'
]
:
''
;
$tmp
[
'deliveryTime'
]
=
$value
[
'batch'
];
//批次
$tmp
[
'send_email'
]
=
!
empty
(
$value
[
'send_email'
])
?
$value
[
'send_email'
]
:
''
;
// 若采购为平台,则调整收件人
if
(
$value
[
'buyerName'
]
==
'平台'
)
{
$send_email
=
Config
(
'config.pingtai_mail'
);
}
else
{
$send_email
=
!
empty
(
$value
[
'send_email'
])
?
$value
[
'send_email'
]
:
''
;
}
$tmp
[
'send_email'
]
=
$send_email
;
$send_buyers
[
$value
[
'buyer_id'
]][
'data'
][]
=
$tmp
;
$send_buyers
[
$value
[
'buyer_id'
]][
'toUser'
]
=
$
value
[
'send_email'
]
;
$send_buyers
[
$value
[
'buyer_id'
]][
'toUser'
]
=
$
send_email
;
$send_buyers
[
$value
[
'buyer_id'
]][
'date'
]
=
date
(
'Y-m-d'
,
time
());
$send_buyers
[
$value
[
'buyer_id'
]][
'id'
]
=
$sale_name
;
...
...
config/config.php
View file @
600874a7
...
...
@@ -42,6 +42,7 @@ return [
// 平台邮箱后台ID (pingtai@ichunt.com)
'pingtai_id'
=>
1605
,
// 平台账号变更邮件收件人
'pingtai_mail'
=>
'zjl@ichunt.com'
,
];
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