Skip to content

朱继来 / 后台订单管理

Go to a project
Commit e9ae9ea6 by 朱继来
Options

Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_iteration_20200714

parents b563559b 4e9aa2d2
Inline Side-by-side
Showing with 99 additions and 26 deletions
app/Http/Controllers/RefundController.php
...@@ -125,10 +125,12 @@ class RefundController extends Controller ...@@ -125,10 +125,12 @@ class RefundController extends Controller
$info = $this->getPageInfo($request); $info = $this->getPageInfo($request);
$info['title'] = $type == 1 ? '联营退款申请列表' : '自营退款申请列表'; $info['title'] = $type == 1 ? '联营退款申请列表' : '自营退款申请列表';
$map['refund_sn'] = $request->input('refund_sn', '');
$map['order_sn'] = $request->input('order_sn', ''); $map['order_sn'] = $request->input('order_sn', '');
$map['sku_name'] = $request->input('sku_name', ''); $map['sku_name'] = $request->input('sku_name', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', ''); $map['order_payment_mode'] = $request->input('order_payment_mode', '');
$map['apply_status'] = $request->input('apply_status', ''); $map['apply_status'] = $request->input('apply_status', '');
$map['is_refund'] = $request->input('is_refund', '');
$map['time_start'] = $request->input('time_start', ''); $map['time_start'] = $request->input('time_start', '');
$map['time_end'] = $request->input('time_end', ''); $map['time_end'] = $request->input('time_end', '');
$map['order_goods_type'] = $type; // 类型 $map['order_goods_type'] = $type; // 类型
......
app/Http/Controllers/ReturnController.php
...@@ -120,6 +120,7 @@ class ReturnController extends Controller ...@@ -120,6 +120,7 @@ class ReturnController extends Controller
$map['sku_name'] = $request->input('sku_name', ''); $map['sku_name'] = $request->input('sku_name', '');
$map['order_payment_mode'] = $request->input('order_payment_mode', ''); $map['order_payment_mode'] = $request->input('order_payment_mode', '');
$map['apply_status'] = $request->input('apply_status', ''); $map['apply_status'] = $request->input('apply_status', '');
$map['is_refund'] = $request->input('is_refund', '');
$map['time_start'] = $request->input('time_start', ''); $map['time_start'] = $request->input('time_start', '');
$map['time_end'] = $request->input('time_end', ''); $map['time_end'] = $request->input('time_end', '');
$map['order_goods_type'] = $type; // 类型 $map['order_goods_type'] = $type; // 类型
......
public/js/refund.js
...@@ -60,13 +60,15 @@ ...@@ -60,13 +60,15 @@
// 搜索、导出条件 // 搜索、导出条件
function refundCommon(url) { function refundCommon(url) {
var order_sn = $('input[name="order_sn"]').val(), var refund_sn = $('input[name="refund_sn"]').val();
sku_name = $('input[name="sku_name"]').val(), var order_sn = $('input[name="order_sn"]').val();
apply_status = $('#apply_status').val() ? $('#apply_status').val() : '', var sku_name = $('input[name="sku_name"]').val();
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '', var apply_status = $('#apply_status').val() ? $('#apply_status').val() : '';
time_start = $('input[name="time_start"]').val(), var is_refund = $('#is_refund').val() ? $('#is_refund').val() : '';
time_end = $('input[name="time_end"]').val(), var order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '';
order_goods_type = $('input[name="order_goods_type"]').val(); var time_start = $('input[name="time_start"]').val();
var time_end = $('input[name="time_end"]').val();
var order_goods_type = $('input[name="order_goods_type"]').val();
if (url == '/refund_export' || url == '/refund_self_export') { if (url == '/refund_export' || url == '/refund_self_export') {
if (!order_sn && !sku_name && !apply_status && !order_payment_mode && !time_start && !time_end) { if (!order_sn && !sku_name && !apply_status && !order_payment_mode && !time_start && !time_end) {
...@@ -77,7 +79,11 @@ ...@@ -77,7 +79,11 @@
var listUrl = url; var listUrl = url;
listUrl += '?order_sn=' + order_sn; listUrl += '?refund_sn=' + refund_sn;
if (order_sn) {
listUrl += '&order_sn=' + specialStr(order_sn);
}
if (sku_name) { if (sku_name) {
listUrl += '&sku_name=' + specialStr(sku_name); listUrl += '&sku_name=' + specialStr(sku_name);
...@@ -91,6 +97,10 @@ ...@@ -91,6 +97,10 @@
listUrl += '&apply_status=' + apply_status; listUrl += '&apply_status=' + apply_status;
} }
if (is_refund) {
listUrl += '&is_refund=' + is_refund;
}
if(time_start){ if(time_start){
time_start = Date.parse(time_start) / 1000; time_start = Date.parse(time_start) / 1000;
...@@ -103,7 +113,7 @@ ...@@ -103,7 +113,7 @@
listUrl += '&time_end='+time_end; listUrl += '&time_end='+time_end;
} }
if (!order_sn && !sku_name && !apply_status && !order_payment_mode && !time_start && !time_end) { if (!refund_sn && !order_sn && !sku_name && !apply_status && !is_refund && !order_payment_mode && !time_start && !time_end) {
listUrl = url; listUrl = url;
} }
...@@ -224,23 +234,24 @@ ...@@ -224,23 +234,24 @@
// 搜索、导出条件 // 搜索、导出条件
function refundCommon(url) { function refundCommon(url) {
var order_sn = $('input[name="order_sn"]').val(), var order_sn = $('input[name="order_sn"]').val();
sku_name = $('input[name="sku_name"]').val(), var sku_name = $('input[name="sku_name"]').val();
apply_status = $('#apply_status').val() ? $('#apply_status').val() : '', var apply_status = $('#apply_status').val() ? $('#apply_status').val() : '';
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '', var is_refund = $('#is_refund').val() ? $('#is_refund').val() : '';
time_start = $('input[name="time_start"]').val(), var order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '';
time_end = $('input[name="time_end"]').val(), var time_start = $('input[name="time_start"]').val();
order_goods_type = $('input[name="order_goods_type"]').val(), var time_end = $('input[name="time_end"]').val();
sale_id = $('#sale_id').val() ? $('#sale_id').val() : ''; var order_goods_type = $('input[name="order_goods_type"]').val();
var sale_id = $('#sale_id').val() ? $('#sale_id').val() : '';
if (url == '/return_export' || url == '/self_return_export') { if (url == '/return_export' || url == '/self_return_export') {
if (!order_sn && !sku_name && !apply_status && !order_payment_mode && !time_start && !time_end) { if (!order_sn && !sku_name && !apply_status && !is_refund && !order_payment_mode && !time_start && !time_end) {
layer.msg('请选择筛选条件，再导出！'); layer.msg('请选择筛选条件，再导出！');
return false; return false;
} }
} }
if (!order_sn && !sku_name && !apply_status && !order_payment_mode && !time_start && !time_end) { if (!order_sn && !sku_name && !apply_status && !is_refund && !order_payment_mode && !time_start && !time_end) {
location.href = url; location.href = url;
} }
...@@ -260,6 +271,10 @@ ...@@ -260,6 +271,10 @@
listUrl += '&apply_status=' + apply_status; listUrl += '&apply_status=' + apply_status;
} }
if (is_refund) {
listUrl += '&is_refund=' + is_refund;
}
if(time_start){ if(time_start){
time_start = Date.parse(time_start) / 1000; time_start = Date.parse(time_start) / 1000;
......
resources/views/refundlist/content.blade.php
...@@ -9,6 +9,13 @@ ...@@ -9,6 +9,13 @@
<tr> <tr>
<td> <td>
<dl> <dl>
<dt>退款单号：</dt>
<dd>
<input type="text" id="refund_sn" name="refund_sn" value="{{$condition['refund_sn']}}" placeholder="请输入退款单号">
</dd>
</dl>
<dl>
<dt>订单编号：</dt> <dt>订单编号：</dt>
<dd> <dd>
<input type="text" id="order_sn" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号"> <input type="text" id="order_sn" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
...@@ -41,15 +48,26 @@ ...@@ -41,15 +48,26 @@
<dt>处理状态：</dt> <dt>处理状态：</dt>
<dd> <dd>
<select id="apply_status" name="apply_status" class="form-control apply_status selectpicker" title="全部" multiple> <select id="apply_status" name="apply_status" class="form-control apply_status selectpicker" title="全部" multiple>
<option value="-1">已拒绝</option> <!-- <option value="-1">已拒绝</option> -->
<option value="1">待处理</option> <option value="1">待处理</option>
<option value="5">已退款</option> <!-- <option value="5">已退款</option> -->
<option value="10">已处理</option> <option value="10">已处理</option>
</select> </select>
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>是否退款：</dt>
<dd>
<select id="is_refund" name="is_refund" class="form-control is_refund selectpicker">
<option value="">全部</option>
<option value="1">是</option>
<option value="-1">否</option>
</select>
</dd>
</dl>
<dl>
<dt>创建日期： </dt> <dt>创建日期： </dt>
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" /> <input type="text" name="time_start" value="{{ !empty($condition['time_start']) ? date('Y/m/d', $condition['time_start']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="开始时间" autocomplete="off" />
...@@ -79,6 +97,7 @@ ...@@ -79,6 +97,7 @@
<tr> <tr>
<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>
<!-- 联营退款时显示 --> <!-- 联营退款时显示 -->
...@@ -88,6 +107,7 @@ ...@@ -88,6 +107,7 @@
@endif @endif
<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>
...@@ -96,7 +116,7 @@ ...@@ -96,7 +116,7 @@
@if (empty($list)) @if (empty($list))
<tr> <tr>
<td class="text-center" colspan="8">没有查询到相关记录~</td> <td class="text-center" colspan="10">没有查询到相关记录~</td>
</tr> </tr>
@else @else
<tbody> <tbody>
...@@ -104,6 +124,7 @@ ...@@ -104,6 +124,7 @@
<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"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td> <td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td>
<td class="show-list">{{$v['refund_sn']}}</td>
<td class="show-list">{{$v['order_sn']}}</td> <td class="show-list">{{$v['order_sn']}}</td>
<?php <?php
$currencySign = $v['currency'] == 1 ? '￥' : '$'; $currencySign = $v['currency'] == 1 ? '￥' : '$';
...@@ -118,13 +139,22 @@ ...@@ -118,13 +139,22 @@
<td class="show-list"> <td class="show-list">
<?php <?php
switch ($v['status']) { switch ($v['status']) {
case -1: echo '<span class="list-text-cancel"><b>已拒绝</b></span>';break; // case -1: echo '<span class="list-text-cancel"><b>已拒绝</b></span>';break;
case 1: echo '<span class="list-text-checking"><b>待处理</b></span>';break; case 1: echo '<span class="list-text-checking"><b>待处理</b></span>';break;
case 5: echo '<span class="list-text-checking"><b>已退款</b></span>';break; // case 5: echo '<span class="list-text-checking"><b>已退款</b></span>';break;
case 10: echo '<span class="list-text-success"><b>已处理</b></span>';break; case 10: echo '<span class="list-text-success"><b>已处理</b></span>';break;
} }
?> ?>
</td> </td>
<td>
<?php
if ($v['is_refund'] == -1) {
echo '<span class="list-text-checking"><b>否</b></span>';
} else {
echo '<span class="list-text-success"><b>是</b></span>';
}
?>
</td>
<?php $pay_name = App\Http\Controllers\getPayName($v['order_id']); ?> <?php $pay_name = App\Http\Controllers\getPayName($v['order_id']); ?>
<td class="show-list"><?php print_r($pay_name); ?></td> <td class="show-list"><?php print_r($pay_name); ?></td>
<td class="show-list">{{$v['refund_time'] ? date('Y-m-d H:i:s', $v['refund_time']) : ''}}</td> <td class="show-list">{{$v['refund_time'] ? date('Y-m-d H:i:s', $v['refund_time']) : ''}}</td>
...@@ -139,7 +169,7 @@ ...@@ -139,7 +169,7 @@
@endif @endif
<!-- <a class="btn btn-info wallet-refund" data-oid="{{$v['order_id']}}" data-amount="{{number_format($v['pay_amount'] - $v['price_fall'], 2)}}" target="_blank">钱包退款</a> --> <!-- <a class="btn btn-info wallet-refund" data-oid="{{$v['order_id']}}" data-amount="{{number_format($v['pay_amount'] - $v['price_fall'], 2)}}" target="_blank">钱包退款</a> -->
<a class="btn btn-info" href="/wallet_refund/{{$v['refund_id']}}" target="_blank">钱包退款</a> <!-- <a class="btn btn-info" href="/wallet_refund/{{$v['refund_id']}}" target="_blank">钱包退款</a> -->
@endif @endif
</div> </div>
</td> </td>
...@@ -157,6 +187,7 @@ ...@@ -157,6 +187,7 @@
<script> <script>
var apply_status = "{{$condition['apply_status']}}"; var apply_status = "{{$condition['apply_status']}}";
var is_refund = "{{$condition['is_refund']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}"; var order_payment_mode = "{{$condition['order_payment_mode']}}";
$(".apply_status, .order_payment_mode").selectpicker({ $(".apply_status, .order_payment_mode").selectpicker({
...@@ -168,6 +199,7 @@ ...@@ -168,6 +199,7 @@
}) })
$('.apply_status').selectpicker('val', apply_status.split(',')).trigger("change"); $('.apply_status').selectpicker('val', apply_status.split(',')).trigger("change");
$('.is_refund').selectpicker('val', is_refund).trigger("change");
$('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change"); $('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change");
$.lie.refund.index(); $.lie.refund.index();
......
resources/views/returnlist/content.blade.php
...@@ -50,6 +50,17 @@ ...@@ -50,6 +50,17 @@
</dd> </dd>
</dl> </dl>
<dl>
<dt>是否退款：</dt>
<dd>
<select id="is_refund" name="is_refund" class="form-control is_refund selectpicker">
<option value="">全部</option>
<option value="1">是</option>
<option value="-1">否</option>
</select>
</dd>
</dl>
@if (in_array($role, [1, 2, 10, 11])) @if (in_array($role, [1, 2, 10, 11]))
<dl> <dl>
<dt>客服：</dt> <dt>客服：</dt>
...@@ -109,6 +120,7 @@ ...@@ -109,6 +120,7 @@
<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>
...@@ -118,7 +130,7 @@ ...@@ -118,7 +130,7 @@
@if (empty($list)) @if (empty($list))
<tr> <tr>
<td class="text-center" colspan="9">没有查询到相关记录~</td> <td class="text-center" colspan="11">没有查询到相关记录~</td>
</tr> </tr>
@else @else
<tbody> <tbody>
...@@ -145,6 +157,15 @@ ...@@ -145,6 +157,15 @@
} }
?> ?>
</td> </td>
<td>
<?php
if ($v['is_refund'] == -1) {
echo '<span class="list-text-checking"><b>否</b></span>';
} else {
echo '<span class="list-text-success"><b>是</b></span>';
}
?>
</td>
<?php $pay_name = App\Http\Controllers\getPayName($v['order_id']); ?> <?php $pay_name = App\Http\Controllers\getPayName($v['order_id']); ?>
<td class="show-list"><?php print_r($pay_name); ?></td> <td class="show-list"><?php print_r($pay_name); ?></td>
<td>{{ App\Http\Controllers\getSalesName($v['create_uid']) }}</td> <td>{{ App\Http\Controllers\getSalesName($v['create_uid']) }}</td>
...@@ -181,6 +202,7 @@ ...@@ -181,6 +202,7 @@
var shippings_info = eval('('+shippings+')'); var shippings_info = eval('('+shippings+')');
var apply_status = "{{$condition['apply_status']}}"; var apply_status = "{{$condition['apply_status']}}";
var is_refund = "{{$condition['is_refund']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}"; var order_payment_mode = "{{$condition['order_payment_mode']}}";
var sale_id = "{{$condition['sale_id']}}"; var sale_id = "{{$condition['sale_id']}}";
...@@ -193,6 +215,7 @@ ...@@ -193,6 +215,7 @@
}) })
$('.apply_status').selectpicker('val', apply_status.split(',')).trigger("change"); $('.apply_status').selectpicker('val', apply_status.split(',')).trigger("change");
$('.is_refund').selectpicker('val', is_refund).trigger("change");
$('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change"); $('.order_payment_mode').selectpicker('val', order_payment_mode.split(',')).trigger("change");
$('#sale_id').selectpicker('val', sale_id.split(',')).trigger("change"); $('#sale_id').selectpicker('val', sale_id.split(',')).trigger("change");
......
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