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
d6919bd9
authored
Mar 29, 2021
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整导出
parent
fbb9a09c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
app/Model/OrderModel.php
app/Model/OrderModel.php
View file @
d6919bd9
...
...
@@ -390,13 +390,13 @@ class OrderModel extends Model
$tmp
[
$i
][
'user_account'
]
=
$order
[
$i
][
'mobile'
]
?
$order
[
$i
][
'mobile'
]
:
$order
[
$i
][
'email'
];
// $tmp[$i]['is_new'] = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户
$tmp
[
$i
][
'consignee'
]
=
isset
(
$current_order_addr
[
'consignee'
])
?
$current_order_addr
[
'consignee'
]
:
''
;
$tmp
[
$i
][
'consignee'
]
=
isset
(
$current_order_addr
[
'consignee'
])
?
$current_order_addr
[
'consignee'
]
.
"
\t
"
:
''
;
$tmp
[
$i
][
'create_time_date'
]
=
date
(
'Y-m-d'
,
$order
[
$i
][
'create_time'
]);
$tmp
[
$i
][
'create_time_sec'
]
=
date
(
'H:i:s'
,
$order
[
$i
][
'create_time'
]);
$tmp
[
$i
][
'com_name'
]
=
!
empty
(
$order
[
$i
][
'tax_title'
])
?
$order
[
$i
][
'tax_title'
]
:
$current_com_name
;
$tmp
[
$i
][
'items_source'
]
=
$this
->
getOrderSource
(
$order
[
$i
][
'order_id'
],
$order
[
$i
][
'order_type'
],
$order
[
$i
][
'order_goods_type'
],
$order
[
$i
][
'extend_order_type'
],
$order
[
$i
][
'order_source'
]);
$tmp
[
$i
][
'goods_id'
]
=
$order
[
$i
][
'goods_id'
];
$tmp
[
$i
][
'goods_id'
]
=
$order
[
$i
][
'goods_id'
]
.
"
\t
"
;
// 自营商品名称换成商品型号
$tmp
[
$i
][
'goods_name'
]
=
$order
[
$i
][
'order_goods_type'
]
==
1
?
$order
[
$i
][
'goods_name'
]
:
$this
->
getGoodsName
(
$order
[
$i
][
'goods_id'
]);
...
...
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