Skip to content

朱继来 / 后台订单管理

Go to a project
Commit b9de71cb by allen
Options

Merge branch 'master' of ssh://119.23.72.7:22611/zhujilai/Order

parents e64c9ed5 dd065702
Inline Side-by-side
Showing with 47 additions and 27 deletions
app/Http/Controllers/SpecialController.php
...@@ -230,31 +230,31 @@ class SpecialController extends Controller ...@@ -230,31 +230,31 @@ class SpecialController extends Controller
// 处理支付记录 // 处理支付记录
public function handlePayLog() public function handlePayLog()
{ {
$PayLogModel = new PayLogModel(); // $PayLogModel = new PayLogModel();
$pay_log = $PayLogModel->where('pay_type', 4)->where('is_paid', -1)->orderBy('create_time', 'desc')->get()->toArray(); // $pay_log = $PayLogModel->where('pay_type', 4)->where('is_paid', -1)->orderBy('create_time', 'desc')->get()->toArray();
$data = []; // $data = [];
foreach ($pay_log as $k=>$v) { // foreach ($pay_log as $k=>$v) {
$log = $PayLogModel->where('order_id', $v['order_id'])->where('pay_type', 1)->first(); // $log = $PayLogModel->where('order_id', $v['order_id'])->where('pay_type', 1)->first();
if (!$log) // if (!$log)
continue; // continue;
// dump($log['order_id'].'==='.date('Y-m-d H:i:s', $log['create_time']).'==='.date('Y-m-d H:i:s', $log['pay_time'])); // // dump($log['order_id'].'==='.date('Y-m-d H:i:s', $log['create_time']).'==='.date('Y-m-d H:i:s', $log['pay_time']));
// $PayLogModel->where('pay_log_id', $v['pay_log_id'])->update(['is_paid'=>1, 'pay_time'=>$log['pay_time']]); // 更新账期支付 // // $PayLogModel->where('pay_log_id', $v['pay_log_id'])->update(['is_paid'=>1, 'pay_time'=>$log['pay_time']]); // 更新账期支付
// $PayLogModel->where('pay_log_id', $log['pay_log_id'])->delete(); // // $PayLogModel->where('pay_log_id', $log['pay_log_id'])->delete();
// // 记录到日志 // // // 记录到日志
// $monolog = Log::getMonolog(); // // $monolog = Log::getMonolog();
// $monolog->popHandler(); // // $monolog->popHandler();
// Log::useDailyFiles(storage_path('logs/update_pay_log.log')); // // Log::useDailyFiles(storage_path('logs/update_pay_log.log'));
// Log::info('更新账期支付记录ID：'.$v['pay_log_id'].'，删除的支付记录ID：'.$log['pay_log_id']); // // Log::info('更新账期支付记录ID：'.$v['pay_log_id'].'，删除的支付记录ID：'.$log['pay_log_id']);
$data[] = $log['pay_log_id']; // $data[] = $log['pay_log_id'];
} // }
dd($data); // dd($data);
} }
// 自营预售订单改预付款 // 自营预售订单改预付款
......
resources/views/orderlist/content.blade.php
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type"> <div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="order_type_tab active" data-val="">订单编号</li> <li class="order_type_tab active" data-val="">会员账号</li>
<li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab" data-val="4">会员ID</li> <li class="order_type_tab" data-val="4">会员ID</li>
<li class="order_type_tab" data-val="2">型号名称</li>
</ul> </ul>
</div> </div>
</dd> </dd>
...@@ -36,12 +34,24 @@ ...@@ -36,12 +34,24 @@
<input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" /> <input type="text" name="time_end" value="{{ !empty($condition['time_end']) ? date('Y/m/d', $condition['time_end']) : '' }}" class="Wdate " onfocus="WdatePicker({dateFmt:'yyyy/MM/dd'})" placeholder="结束时间" autocomplete="off" />
</dd> </dd>
</dl> </dl>
<dl>
<dt>订单编号：</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl> <dl>
<dt>ERP订单号：</dt> <dt>ERP订单号：</dt>
<dd> <dd>
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号"> <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd> </dd>
</dl> </dl>
<dl>
<dt>型号名称：</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl> <dl>
<dt>订单状态：</dt> <dt>订单状态：</dt>
<dd> <dd>
......
resources/views/selfOrder/content.blade.php
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
<dd style="width:auto !important;"> <dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type"> <div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="order_type_tab active" data-val="">订单编号</li> <li class="order_type_tab active" data-val="">会员账号</li>
<li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab" data-val="4">会员ID</li> <li class="order_type_tab" data-val="4">会员ID</li>
<li class="order_type_tab" data-val="2">型号名称</li>
<li class="order_type_tab" data-val="3">发票抬头</li> <li class="order_type_tab" data-val="3">发票抬头</li>
</ul> </ul>
</div> </div>
...@@ -38,12 +36,24 @@ ...@@ -38,12 +36,24 @@
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>订单编号：</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl>
<dt>ERP订单号：</dt> <dt>ERP订单号：</dt>
<dd> <dd>
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号"> <input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd> </dd>
</dl> </dl>
<dl> <dl>
<dt>型号名称：</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl>
<dt>订单状态：</dt> <dt>订单状态：</dt>
<dd> <dd>
<select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple> <select id="order_status" name="order_status" class="form-control order_status selectpicker" title="全部" multiple>
......
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