Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 28498475 by 朱继来
Options

调整订单退款列表

parent 843d3c3d
Inline Side-by-side
Showing with 70 additions and 27 deletions
app/Http/Controllers/OrderController.php
......@@ -1291,6 +1291,8 @@ Class OrderController extends Controller
'order_temp_info' => $temp['data']['order_temp_info'],
'order_shipping_inside' => $temp['data']['order_shipping_inside'],
'actionLog' => $actionLog,
'order_refund_info' => $temp['data']['order_refund_info'],
'order_refund_items' => $temp['data']['order_refund_items'],
];
$response = array_merge($response, $info);
......
resources/views/detail/content.blade.php
......@@ -472,6 +472,32 @@
@endif
</tfoot>
</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 class="tabs-box order-total table-responsive">
......
resources/views/refundDetails/content.blade.php
......@@ -5,19 +5,19 @@
<div class="tabs-box table-responsive">
<table class="table table-bordered order-express">
<tr>
<td width="10%">订单编号</td>
<th width="10%">订单编号</th>
<td>{{$refund->order_sn}} <a href="/details/{{$refund->order_id}}" target="_blank" style="margin-left: 20px;">查看订单</a></td>
</tr>
<tr>
<td>用户账号</td>
<th>用户账号</th>
<td>{{ App\Http\Controllers\getUserName($refund->create_uid) }}</td>
</tr>
<tr>
<td>申请时间</td>
<th>申请时间</th>
<td>{{$refund->create_time ? date('Y-m-d H:i:s') : ''}}</td>
</tr>
<tr>
<td>申请状态</td>
<th>申请状态</th>
<td>
<?php
switch ($refund->status) {
......@@ -34,38 +34,51 @@
?>
<tr>
<td>订单金额</td>
<th>订单金额</th>
<td>{{$currencySign}} {{ App\Http\Controllers\getOrderAmount($refund->order_id) }}</td>
</tr>
<tr>
<td>退款金额</td>
<th>退款金额</th>
<td>{{$currencySign.$refund->pay_amount}}</td>
</tr>
<tr>
<td>手动差价</td>
<th>手动差价</th>
<td>{{$currencySign.$refund->price_fall}}</td>
</tr>
<tr>
<td>最终退款总额</td>
<th>最终退款总额</th>
<td>{{$currencySign.($refund->pay_amount - $refund->price_fall)}}</td>
</tr>
<tr>
<td>退款原因</td>
<th>退款原因</th>
<td>{{$refund->refund_reason}}</td>
</tr>
<tr>
<td>退款型号</td>
<th>退款型号</th>
<td>
<?php
$str = '';
if ($refundItems) {
foreach ($refundItems as $v) {
$str .= $v->goods_name.', ';
}
@if ($refundItems)
<table class="table">
<thead>
<tr>
<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>
</tr>
</table>
......
resources/views/refundlist/content.blade.php
......@@ -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>
......@@ -72,7 +74,7 @@
@if (empty($list))
<tr>
<td class="text-center" colspan="7">没有查询到相关记录~</td>
<td class="text-center" colspan="9">没有查询到相关记录~</td>
</tr>
@else
<tbody>
......@@ -80,13 +82,13 @@
<tr>
<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['order_sn']}}</td>
<td class="show-list">
<?php
$currencySign = $v['currency'] == 1 ? '￥' : '$';
echo $currencySign.$v['pay_amount'];
?>
</td>
<td class="show-list">{{$v['order_sn']}}</td>
<?php
$currencySign = $v['currency'] == 1 ? '￥' : '$';
?>
<td class="show-list">{{$currencySign.$v['pay_amount']}}</td>
<td class="show-list">{{$currencySign.$v['price_fall']}}</td>
<td class="show-list">{{$currencySign.number_format($v['pay_amount'] - $v['price_fall'], 2)}}</td>
<td class="show-list">
<?php
switch ($v['status']) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment