Skip to content

朱继来 / 后台订单管理

Go to a project
Commit a4d2db41 by 朱继来
Options

temp

parent 1d16214e
Inline Side-by-side
Showing with 40 additions and 22 deletions
app/Http/Controllers/OrderController.php
...@@ -260,12 +260,18 @@ function isChangeInvoice($order_sn) ...@@ -260,12 +260,18 @@ function isChangeInvoice($order_sn)
} }
} }
// 自营线下订单 // 订单扩展表
function getOrderExtend($order_id) function getOrderExtend($order_id, $field="*", $where=array())
{ {
$extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $order_id, 'order_type' => 3])->select('temp_id')->first(); $map['order_id'] = $order_id;
return $extend ? true : false; if (!empty($where)) {
$map = array_merge($map, $where);
}
$extend = DB::connection('order')->table('lie_order_extend')->where($map)->select($field)->first();
return $extend;
} }
Class OrderController extends Controller Class OrderController extends Controller
...@@ -1319,7 +1325,7 @@ Class OrderController extends Controller ...@@ -1319,7 +1325,7 @@ Class OrderController extends Controller
$check['k2'] = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi'); $check['k2'] = md5(md5($check['k1']).'fh6y5t4rr351d2c3bryi');
$resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$order_id, "cancel_reason"=>$cancel_reason, 'operator_id'=>$operator_id, 'type' => 2); $resData = array("pf"=>1, "k1"=>$check['k1'], "k2"=>$check['k2'], "order_id"=>$order_id, "cancel_reason"=>$cancel_reason, 'operator_id'=>$operator_id, 'type' => 2);
$temp = json_decode(curlApi($url, $resData, "POST"), true); $temp = json_decode(curlApi($url, $resData, "POST"), true);
return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']); return array('errcode'=>$temp['err_code'],'errmsg'=>$temp['err_msg']);
......
public/js/order.js
...@@ -1265,8 +1265,8 @@ ...@@ -1265,8 +1265,8 @@
$('.checkOrder').click(function(){ $('.checkOrder').click(function(){
var is_newClient = $('input[name=is_newClient]:checked').val(); var is_newClient = $('input[name=is_newClient]:checked').val();
var client_source = $('input[name=client_source]:checked').val(); var client_source = $('input[name=client_source]:checked').val();
var order_status = $('input[name=order_status]:checked').val(); var order_status = $('input[name=order_status]:checked').val() ? $('input[name=order_status]:checked').val() : 2;
var pay_type = $('input[name=order_pay_type]:checked').val(); // 订单付款类型 var pay_type = $('input[name=order_pay_type]:checked').val() ? $('input[name=order_pay_type]:checked').val() : 1; // 订单付款类型
var reason = $('input[name=reason]:checked').val(); var reason = $('input[name=reason]:checked').val();
var payTime = $('.payTime').val(); var payTime = $('.payTime').val();
var payTimeOther = $('.payTimeOther').val(); var payTimeOther = $('.payTimeOther').val();
......
resources/views/detail/changeOrder.blade.php
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
@endif @endif
<!-- 审核 --> <!-- 审核 -->
@if ($order_info['order_goods_type'] == 1)
<p>审核</p> <p>审核</p>
<table class="table table-bordered table-hover check-table"> <table class="table table-bordered table-hover check-table">
<tr> <tr>
...@@ -80,8 +81,10 @@ ...@@ -80,8 +81,10 @@
</td> </td>
</tr> </tr>
</table> </table>
<hr/> <hr/>
@endif
<!-- 调价 --> <!-- 调价 -->
<p>调价</p> <p>调价</p>
<table class="table table-bordered table-hover order-change-table"> <table class="table table-bordered table-hover order-change-table">
......
resources/views/detail/content.blade.php
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
<th>供应商</th> <th>供应商</th>
<?php <?php
if ($action_name == 'changeOrder' && count($order_items_info) > 1 && $order_info['status'] == 1) { if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2])) {
echo '<th>操作</th>'; echo '<th>操作</th>';
} }
?> ?>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<td>{{$v['delivery_time']}}</td> <td>{{$v['delivery_time']}}</td>
<td>{{$v['supplier_name']}}</td> <td>{{$v['supplier_name']}}</td>
@if ($action_name == 'changeOrder' && count($order_items_info) > 1 && $order_info['status'] == 1) @if ($action_name == 'changeOrder' && count($order_items_info) > 1 && in_array($order_info['status'], [1, 2]))
<td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td> <td><a class="btn btn-danger deletegoods" href="javascript:;" data-id="{{$v['rec_id']}}">删除</a></td>
@endif @endif
</tr> </tr>
...@@ -606,20 +606,20 @@ ...@@ -606,20 +606,20 @@
@elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && $action_name != 'changeOrder') @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && $action_name != 'changeOrder')
<p style="padding-left: 5px;">操作</p> <p style="padding-left: 5px;">操作</p>
<div class="tabs-box"> <div class="tabs-box">
@if (in_array($order_info['status'], [1, 2, 3, 4]) && in_array('self_order_cancel', $userPerms))
<a class="btn btn-danger self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}">取消订单</a>
@endif
<!-- 判断状态和权限 $extend-自营线下订单 --> <!-- 判断状态和权限 $extend-自营线下订单 -->
@if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && $extend) @if ($order_info['status'] == 1 && in_array('add_offline_audit', $userPerms) && $extend)
<a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a> <!-- <a class="btn btn-success self-check" data-id="{{$order_info['order_id']}}">内部订单审核</a> -->
@endif @endif
<!-- 订单审单 --> <!-- 订单审单 -->
@if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms) && !$extend) @if (in_array($order_info['status'], [1, 2]) && in_array('self_check_order', $userPerms))
<a class="btn btn-info" href="/change/{{$order_info['order_id']}}?tags=self">人工审单</a> <a class="btn btn-info" href="/change/{{$order_info['order_id']}}?tags=self">人工审单</a>
@endif @endif
@if (in_array($order_info['status'], [1, 2, 3, 4]) && !$extend && in_array('self_order_cancel', $userPerms))
<a class="btn btn-danger self_cancel" href="javascript:;" data-id="{{$order_info['order_id']}}">取消订单</a>
@endif
@if ($order_info['status'] == 2 && in_array('self_check_pay', $userPerms)) @if ($order_info['status'] == 2 && in_array('self_check_pay', $userPerms))
<a href="/self_check_pay/{{$order_info['order_id']}}?tags=self" class="btn btn-success">对账</a> <a href="/self_check_pay/{{$order_info['order_id']}}?tags=self" class="btn btn-success">对账</a>
@endif @endif
......
resources/views/orderlist/content.blade.php
...@@ -340,9 +340,13 @@ ...@@ -340,9 +340,13 @@
<td class="table-list-content"> <td class="table-list-content">
<p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['user_id'])}}">{{App\Http\Controllers\getCompanyName($v['user_id'])}}</p> <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['user_id'])}}">{{App\Http\Controllers\getCompanyName($v['user_id'])}}</p>
</td> </td>
<td class="table-list-title">Adtag或其它</td> <td class="table-list-title">是否新订单</td>
<td class="table-list-content" colspan="3"> <td class="table-list-content">
<p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p> <?php
$is_new_order = App\Http\Controllers\getOrderExtend($v['order_id'], 'is_new');
echo $is_new_order->is_new ? '是' : '否';
?>
</td> </td>
</tr> </tr>
@if ($v['order_pay_type'] == 2) @if ($v['order_pay_type'] == 2)
...@@ -433,6 +437,12 @@ ...@@ -433,6 +437,12 @@
<td class="table-list-title">发货状态</td> <td class="table-list-title">发货状态</td>
<td class="table-list-content">{{$shippingStatus}}</td> <td class="table-list-content">{{$shippingStatus}}</td>
</tr> </tr>
<tr>
<td class="table-list-title">Adtag或其它</td>
<td class="table-list-content" colspan="3">
<p class="show-title" title="<?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?>"><?php echo App\Http\Controllers\handleOrderSource($v['order_source']); ?></p>
</td>
</tr>
</table> </table>
</td> </td>
</tr> </tr>
......
resources/views/selfOrder/content.blade.php
...@@ -275,9 +275,8 @@ ...@@ -275,9 +275,8 @@
<td> <td>
<div class="btn-group btn-group-xs"> <div class="btn-group btn-group-xs">
<a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a> <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=self" target="_blank">详情</a>
<?php $extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?> @if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]))
@if (in_array('self_check_order', $userPerms) && in_array($v['status'], [1, 2]) && !$extend)
<a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a> <a class="btn btn-success" href="/change/{{$v['order_id']}}?tags=self" target="_blank">人工审单</a>
@endif @endif
......
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