Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 5c5ffcdb by 朱继来
Options

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

parents 14c4531a dd065702
Inline Side-by-side
Showing with 79 additions and 41 deletions
app/Http/Controllers/AddOrderController.php
......@@ -90,16 +90,24 @@ Class AddOrderController extends Controller
{
if ($request->isMethod('post')) {
$mobile = $request->input('mobile');
$user_id = $request->input('user_id');
$goods_type = $request->input('goods_type'); // 类型，1-联营，2-自营
$operator_id = $request->user->userId;
$UserMainModel = new UserMainModel;
if (preg_match('/@/', $mobile)) {
$user = $UserMainModel->where('email', $mobile)->select('user_id', 'email', 'is_test')->orderBy('create_time', 'desc')->first();
} else {
$user = $UserMainModel->where('mobile', $mobile)->select('user_id', 'mobile', 'is_test')->orderBy('create_time', 'desc')->first();
}
if(!empty($user_id)){
$user = $UserMainModel->where('user_id', $user_id)->select('user_id', 'email','mobile', 'is_test')->orderBy('create_time', 'desc')->first();
}else{
if (preg_match('/@/', $mobile)) {
$user = $UserMainModel->where('email', $mobile)->select('user_id', 'email', 'is_test')->orderBy('create_time', 'desc')->first();
} else {
$user = $UserMainModel->where('mobile', $mobile)->select('user_id', 'mobile', 'is_test')->orderBy('create_time', 'desc')->first();
}
}
if (!empty($user)) {
$perm = new PermController;
......
app/Http/Controllers/SpecialController.php
......@@ -230,31 +230,31 @@ class SpecialController extends Controller
// 处理支付记录
public function handlePayLog()
{
$PayLogModel = new PayLogModel();
$pay_log = $PayLogModel->where('pay_type', 4)->where('is_paid', -1)->orderBy('create_time', 'desc')->get()->toArray();
// $PayLogModel = new PayLogModel();
// $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) {
$log = $PayLogModel->where('order_id', $v['order_id'])->where('pay_type', 1)->first();
// foreach ($pay_log as $k=>$v) {
// $log = $PayLogModel->where('order_id', $v['order_id'])->where('pay_type', 1)->first();
if (!$log)
continue;
// if (!$log)
// 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', $log['pay_log_id'])->delete();
// // 记录到日志
// $monolog = Log::getMonolog();
// $monolog->popHandler();
// Log::useDailyFiles(storage_path('logs/update_pay_log.log'));
// Log::info('更新账期支付记录ID：'.$v['pay_log_id'].'，删除的支付记录ID：'.$log['pay_log_id']);
$data[] = $log['pay_log_id'];
}
dd($data);
// // $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();
// // // 记录到日志
// // $monolog = Log::getMonolog();
// // $monolog->popHandler();
// // Log::useDailyFiles(storage_path('logs/update_pay_log.log'));
// // Log::info('更新账期支付记录ID：'.$v['pay_log_id'].'，删除的支付记录ID：'.$log['pay_log_id']);
// $data[] = $log['pay_log_id'];
// }
// dd($data);
}
// 自营预售订单改预付款
......
public/js/add_order.js
......@@ -31,9 +31,10 @@
var loading = this;
// 获取用户信息
$('.get-user').click(function(){
var mobile = $(this).siblings('.search-user').val();
function get_user(){
// var mobile = $(this).siblings('.search-user').val();
var mobile = getUrlParam('user_id');
if (!mobile) return false;
// 自营其他订单类型---仓库损耗
......@@ -46,7 +47,7 @@
$.ajax({
url: '/ajax/getUserInfo',
type: 'post',
data: {mobile : mobile.trim(), goods_type: goods_type},
data: {user_id : mobile.trim(), goods_type: goods_type},
dataType: 'json',
success: function (resp) {
if (resp.errcode == 0) {
......@@ -99,7 +100,9 @@
layer.msg(resp.errmsg)
},
})
})
}
get_user();
// 选择收货地址
$('.user-info').delegate('#address', 'change', function() {
......@@ -969,4 +972,11 @@
},
}
});
})(jQuery)
\ No newline at end of file
})(jQuery)
//获取url中的参数
function getUrlParam(name) {
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
var r = window.location.search.substr(1).match(reg); //匹配目标参数
if (r != null) return unescape(r[2]); return null; //返回参数值
}
\ No newline at end of file
resources/views/addOnline/content.blade.php
......@@ -5,7 +5,7 @@
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="col-sm-12">
<div class="col-sm-12" hidden>
<input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
<a class="btn btn-info get-user">获取用户信息</a>
......
resources/views/addOrder/content.blade.php
......@@ -4,7 +4,7 @@
</div>
<div class="ibox-content create-order">
<div class="row" style="margin-bottom: 30px;">
<div class="row" style="margin-bottom: 30px;" hidden>
<div class="col-sm-12">
<input type="text" class="search-user" name="user-mobile" value="" placeholder="请输入会员账号">
<a class="btn btn-info get-user">获取用户信息</a>
......
resources/views/orderlist/content.blade.php
......@@ -18,10 +18,8 @@
<dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu">
<li class="order_type_tab active" data-val="">订单编号</li>
<li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab active" data-val="">会员账号</li>
<li class="order_type_tab" data-val="4">会员ID</li>
<li class="order_type_tab" data-val="2">型号名称</li>
</ul>
</div>
</dd>
......@@ -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" />
</dd>
</dl>
<dl>
<dt>订单编号：</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl>
<dt>ERP订单号：</dt>
<dd>
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd>
</dl>
</dl>
<dl>
<dt>型号名称：</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl>
<dt>订单状态：</dt>
<dd>
......
resources/views/selfOrder/content.blade.php
......@@ -18,10 +18,8 @@
<dd style="width:auto !important;">
<div class="droplist" data-default="{{$condition['order_type']}}" id="order_type" name="order_type">
<ul class="dropdown-menu">
<li class="order_type_tab active" data-val="">订单编号</li>
<li class="order_type_tab" data-val="1">会员账号</li>
<li class="order_type_tab active" data-val="">会员账号</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>
</ul>
</div>
......@@ -38,12 +36,24 @@
</dd>
</dl>
<dl>
<dt>订单编号：</dt>
<dd>
<input type="text" name="order_sn" value="{{$condition['order_sn']}}" placeholder="请输入订单编号">
</dd>
</dl>
<dl>
<dt>ERP订单号：</dt>
<dd>
<input type="text" name="erp_sn" value="{{$condition['erp_sn']}}" placeholder="请输入ERP订单号">
</dd>
</dl>
<dl>
<dt>型号名称：</dt>
<dd>
<input type="text" name="goods_name" value="{{$condition['goods_name']}}" placeholder="请输入型号名称">
</dd>
</dl>
<dl>
<dt>订单状态：</dt>
<dd>
<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