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
28498475
authored
Jan 14, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整订单退款列表
parent
843d3c3d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
70 additions
and
27 deletions
app/Http/Controllers/OrderController.php
resources/views/detail/content.blade.php
resources/views/refundDetails/content.blade.php
resources/views/refundlist/content.blade.php
app/Http/Controllers/OrderController.php
View file @
28498475
...
@@ -1291,6 +1291,8 @@ Class OrderController extends Controller
...
@@ -1291,6 +1291,8 @@ Class OrderController extends Controller
'order_temp_info'
=>
$temp
[
'data'
][
'order_temp_info'
],
'order_temp_info'
=>
$temp
[
'data'
][
'order_temp_info'
],
'order_shipping_inside'
=>
$temp
[
'data'
][
'order_shipping_inside'
],
'order_shipping_inside'
=>
$temp
[
'data'
][
'order_shipping_inside'
],
'actionLog'
=>
$actionLog
,
'actionLog'
=>
$actionLog
,
'order_refund_info'
=>
$temp
[
'data'
][
'order_refund_info'
],
'order_refund_items'
=>
$temp
[
'data'
][
'order_refund_items'
],
];
];
$response
=
array_merge
(
$response
,
$info
);
$response
=
array_merge
(
$response
,
$info
);
...
...
resources/views/detail/content.blade.php
View file @
28498475
...
@@ -472,6 +472,32 @@
...
@@ -472,6 +472,32 @@
@endif
@endif
</tfoot>
</tfoot>
</table>
</table>
<!-- 退款已处理 -->
@if ($order_refund_info['status'] == 10
&&
$order_price_info['refund_price'] != 0)
<hr>
<table
class=
"table"
>
<thead>
<tr
class=
"caption"
>
<th>
退款型号
</th>
<th>
退款数量
</th>
<th>
价格
</th>
<th>
小计
</th>
</tr>
</thead>
<tbody>
@foreach ($order_refund_items as $k=>$v)
<tr>
<td>
{{$v['goods_name']}}
</td>
<td>
{{$v['refund_num']}}
</td>
<td>
{{$v['single_pre_price']}}
</td>
<td>
{{number_format($v['refund_num'] * $v['single_pre_price'], 4)}}
</td>
</tr>
@endforeach
</tbody>
</table>
@endif
</div>
</div>
<div
class=
"tabs-box order-total table-responsive"
>
<div
class=
"tabs-box order-total table-responsive"
>
...
...
resources/views/refundDetails/content.blade.php
View file @
28498475
...
@@ -5,19 +5,19 @@
...
@@ -5,19 +5,19 @@
<div
class=
"tabs-box table-responsive"
>
<div
class=
"tabs-box table-responsive"
>
<table
class=
"table table-bordered order-express"
>
<table
class=
"table table-bordered order-express"
>
<tr>
<tr>
<t
d
width=
"10%"
>
订单编号
</td
>
<t
h
width=
"10%"
>
订单编号
</th
>
<td>
{{$refund->order_sn}}
<a
href=
"/details/{{$refund->order_id}}"
target=
"_blank"
style=
"margin-left: 20px;"
>
查看订单
</a></td>
<td>
{{$refund->order_sn}}
<a
href=
"/details/{{$refund->order_id}}"
target=
"_blank"
style=
"margin-left: 20px;"
>
查看订单
</a></td>
</tr>
</tr>
<tr>
<tr>
<t
d>
用户账号
</td
>
<t
h>
用户账号
</th
>
<td>
{{ App\Http\Controllers\getUserName($refund->create_uid) }}
</td>
<td>
{{ App\Http\Controllers\getUserName($refund->create_uid) }}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
申请时间
</td
>
<t
h>
申请时间
</th
>
<td>
{{$refund->create_time ? date('Y-m-d H:i:s') : ''}}
</td>
<td>
{{$refund->create_time ? date('Y-m-d H:i:s') : ''}}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
申请状态
</td
>
<t
h>
申请状态
</th
>
<td>
<td>
<?php
<?php
switch
(
$refund
->
status
)
{
switch
(
$refund
->
status
)
{
...
@@ -34,38 +34,51 @@
...
@@ -34,38 +34,51 @@
?>
?>
<tr>
<tr>
<t
d>
订单金额
</td
>
<t
h>
订单金额
</th
>
<td>
{{$currencySign}} {{ App\Http\Controllers\getOrderAmount($refund->order_id) }}
</td>
<td>
{{$currencySign}} {{ App\Http\Controllers\getOrderAmount($refund->order_id) }}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
退款金额
</td
>
<t
h>
退款金额
</th
>
<td>
{{$currencySign.$refund->pay_amount}}
</td>
<td>
{{$currencySign.$refund->pay_amount}}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
手动差价
</td
>
<t
h>
手动差价
</th
>
<td>
{{$currencySign.$refund->price_fall}}
</td>
<td>
{{$currencySign.$refund->price_fall}}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
最终退款总额
</td
>
<t
h>
最终退款总额
</th
>
<td>
{{$currencySign.($refund->pay_amount - $refund->price_fall)}}
</td>
<td>
{{$currencySign.($refund->pay_amount - $refund->price_fall)}}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
退款原因
</td
>
<t
h>
退款原因
</th
>
<td>
{{$refund->refund_reason}}
</td>
<td>
{{$refund->refund_reason}}
</td>
</tr>
</tr>
<tr>
<tr>
<t
d>
退款型号
</td
>
<t
h>
退款型号
</th
>
<td>
<td>
<?php
@if ($refundItems)
$str
=
''
;
<table
class=
"table"
>
if
(
$refundItems
)
{
<thead>
foreach
(
$refundItems
as
$v
)
{
<tr>
$str
.=
$v
->
goods_name
.
', '
;
<th>
退款型号
</th>
}
<th>
退款数量
</th>
<th>
价格
</th>
<th>
小计
</th>
</tr>
</thead>
echo
rtrim
(
$str
,
', '
);
<tbody>
}
@foreach ($refundItems as $k=>$v)
?>
<tr>
<td>
{{$v->goods_name}}
</td>
<td>
{{$v->refund_num}}
</td>
<td>
{{$v->single_pre_price}}
</td>
<td>
{{number_format($v->refund_num * $v->single_pre_price, 4)}}
</td>
</tr>
@endforeach
</tbody>
</table>
@endif
</td>
</td>
</tr>
</tr>
</table>
</table>
...
...
resources/views/refundlist/content.blade.php
View file @
28498475
...
@@ -64,6 +64,8 @@
...
@@ -64,6 +64,8 @@
<th
class=
"pl30"
>
会员账号
</th>
<th
class=
"pl30"
>
会员账号
</th>
<th
class=
"pl30"
>
订单编号
</th>
<th
class=
"pl30"
>
订单编号
</th>
<th
class=
"pl30"
>
退款金额
</th>
<th
class=
"pl30"
>
退款金额
</th>
<th
class=
"pl30"
>
手动差额
</th>
<th
class=
"pl30"
>
最终退款总额
</th>
<th
class=
"pl30"
>
申请状态
</th>
<th
class=
"pl30"
>
申请状态
</th>
<th
class=
"pl30"
>
处理时间
</th>
<th
class=
"pl30"
>
处理时间
</th>
<th
class=
"pl30"
>
操作
</th>
<th
class=
"pl30"
>
操作
</th>
...
@@ -72,7 +74,7 @@
...
@@ -72,7 +74,7 @@
@if (empty($list))
@if (empty($list))
<tr>
<tr>
<td
class=
"text-center"
colspan=
"
7
"
>
没有查询到相关记录~
</td>
<td
class=
"text-center"
colspan=
"
9
"
>
没有查询到相关记录~
</td>
</tr>
</tr>
@else
@else
<tbody>
<tbody>
...
@@ -80,13 +82,13 @@
...
@@ -80,13 +82,13 @@
<tr>
<tr>
<td
class=
"show-list"
>
{{$v['create_time'] ? date('Y-m-d H:i:s', $v['create_time']) : ''}}
</td>
<td
class=
"show-list"
>
{{$v['create_time'] ? date('Y-m-d H:i:s', $v['create_time']) : ''}}
</td>
<td
class=
"show-list"
>
{{$v['mobile'] ? $v['mobile'] : $v['email']}}
</td>
<td
class=
"show-list"
>
{{$v['mobile'] ? $v['mobile'] : $v['email']}}
</td>
<td
class=
"show-list"
>
{{$v['order_sn']}}
</td>
<td
class=
"show-list"
>
{{$v['order_sn']}}
</td>
<
td
class=
"show-list"
>
<
?php
<?php
$currencySign
=
$v
[
'currency'
]
==
1
?
'¥'
:
'$'
;
$currencySign
=
$v
[
'currency'
]
==
1
?
'¥'
:
'$'
;
?>
echo
$currencySign
.
$v
[
'pay_amount'
];
<td
class=
"show-list"
>
{{$currencySign.$v['pay_amount']}}
</td>
?>
<td
class=
"show-list"
>
{{$currencySign.$v['price_fall']}}
</td>
<
/td>
<
td
class=
"show-list"
>
{{$currencySign.number_format($v['pay_amount'] - $v['price_fall'], 2)}}
</td>
<td
class=
"show-list"
>
<td
class=
"show-list"
>
<?php
<?php
switch
(
$v
[
'status'
])
{
switch
(
$v
[
'status'
])
{
...
...
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