Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 7b50b02b by 朱继来
Options

Merge branch 'zjl_inner_account_20190221' into development

parents 96689c96 435b5cd4
Expand all
Inline Side-by-side
Showing with 193 additions and 74 deletions
app/Http/Controllers/AddOrderController.php
......@@ -55,7 +55,6 @@ Class AddOrderController extends Controller
$info = $this->getPageInfo($request);
$info['title'] = '新增联营订单';
$info['sale_id'] = $request->user->userId;
return view('addOrder', $info);
......@@ -67,12 +66,22 @@ Class AddOrderController extends Controller
$info = $this->getPageInfo($request);
$info['title'] = '新增自营线上订单';
$info['sale_id'] = $request->user->userId;
return view('addOnline', $info);
}
// 新增自营其他业务订单
public function addOtherOrder(Request $request)
{
$info = $this->getPageInfo($request);
$info['title'] = '新增自营其他业务订单';
$info['sale_id'] = $request->user->userId;
return view('addOtherOrder', $info);
}
// 获取用户信息
public function getUserInfo(Request $request)
{
......@@ -452,6 +461,10 @@ Class AddOrderController extends Controller
} else { // 联营、自营线上订单
$data['tax_id'] = $request->input('tax_id');
$data['user_coupon_id'] = $request->input('user_coupon_id');
if ($data['type'] == 4) {
$data['business_type'] = $request->input('business_type');
}
}
$data['sale_type'] = $request->input('sale_type', ''); // 自营线上选择销售类型
......@@ -479,12 +492,11 @@ Class AddOrderController extends Controller
$order_id = $request->input('order_id');
$type = $request->input('type');
if ($type == 1) {
$title = '新增联营订单';
} else if ($type == 2) {
$title = '新增自营线上订单';
} else {
$title = '新增自营线下订单';
switch ($type) {
case 1: $title = '新增联营订单'; break;
case 2: $title = '新增自营线上订单'; break;
case 3: $title = '新增自营线下订单'; break;
case 4: $title = '新增自营其他业务订单'; break;
}
$info['title'] = $title;
......
app/Http/Controllers/OrderController.php
......@@ -409,6 +409,7 @@ Class OrderController extends Controller
$map['order_invoice_status']= $request->input('order_invoice_status', '');
$map['is_new'] = $request->input('is_new', '');
$map['is_new_order'] = $request->input('is_new_order', '');
$map['business_type'] = $request->input('business_type', '');
// 订单查看权限---交易员、客服、测试
if (in_array($info['role'], [3, 4])) {
......
app/Http/routes.php
......@@ -105,6 +105,8 @@ Route::group(['middleware' => 'web'], function () {
Route::post('/ajax/checkStock', 'AddOrderController@checkStock');
Route::post('/ajax/batchGoodsImport', 'AddOrderController@batchGoodsImport');
Route::get('/add_other_order', 'AddOrderController@addOtherOrder');
Route::match(['get', 'post'],'/web/{key}', 'WebController@info');
Route::match(['get', 'post'],'/api/{key}', 'ApiController@Entrance');
......
app/Model/OrderModel.php
......@@ -46,6 +46,7 @@ class OrderModel extends Model
$map['order_goods_type'] = $request->input('order_goods_type', '');
$map['is_new'] = $request->input('is_new', '');
$map['is_new_order'] = $request->input('is_new_order', '');
$map['business_type'] = $request->input('business_type', '');
}
/* 临时添加 所有人只能查看线上订单 */
......@@ -230,9 +231,15 @@ class OrderModel extends Model
$query->where('oe.is_new', '=', $map['is_new_order']);
}
})
->where(function ($query) use ($map) {
// 自营其他业务类型
if ($map['business_type'] != '') {
$query->where('oe.order_type', '=', 3)->whereIn('oe.business_type', explode(',', $map['business_type']));
}
})
->where('it.status', '<>', -1)
->where('o.order_goods_type', '=', $map['order_goods_type'])
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'o.order_id', 'o.order_sn', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'a.consignee', 'a.address', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'c.com_name', 'oe.send_remark', 'oe.is_new as is_new_order')
->select('it.goods_id', 'it.goods_name', 'it.goods_number', 'it.goods_price', 'it.single_pre_price', 'it.brand_name', 'it.supplier_name', 'o.order_id', 'o.order_sn', 'o.order_type', 'o.order_pay_type', 'o.order_goods_type', 'o.order_source', 'o.create_time', 'o.status', 'o.order_amount', 'o.currency', 'o.sale_id', 'o.cancel_reason', 'i.tax_title', 'i.inv_type', 'i.invoice_status', 'i.tax_title', 'i.company_address', 'i.company_phone', 'i.tax_no', 'i.bank_name', 'i.bank_account', 'a.consignee', 'a.address', 's.status as shipping_status', 'u.user_id', 'u.mobile', 'u.email', 'u.client_source', 'u.is_new', 'c.com_name', 'oe.send_remark', 'oe.is_new as is_new_order', 'oe.business_type')
->groupBy('it.rec_id')
->orderBy('o.create_time', 'DESC')
->get()
......@@ -252,7 +259,7 @@ class OrderModel extends Model
if ($map['order_goods_type'] == 1) {
$headerCell = ['订单ID', '订单编号', '会员账号', '是否为新订单', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '订单类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注'];
} else {
$headerCell = ['订单ID', '订单编号', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '订单类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注'];
$headerCell = ['订单ID', '订单编号', '业务类型', '会员账号', '收货人', '下单日期', '下单时间', '客户名称', '平台来源', '商品型号', '制造商', '供应商', '数量', '单价', '均摊后单价', '商品小计', '币种', $sale_name, '商品总额', '运费', '附加费', '优惠券', '订单总额', '订单类型', '订单状态', '发货状态', '收货地址', '发票类型', '发票状态', '发票抬头', '公司注册地址', '公司电话', 'adtags来源', '新用户来源', '取消原因', '推送备注'];
}
array_unshift($cellData, $headerCell);
......@@ -333,10 +340,11 @@ class OrderModel extends Model
$sales = DB::table('user_info')->where(['userId' => $order[$i]['sale_id']])->select('name')->first();
}
$tmp[$i]['order_id'] = $order[$i]['order_id'];
$tmp[$i]['order_sn'] = "\t".$order[$i]['order_sn']."\t";
$tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
// $tmp[$i]['is_new'] = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户
$tmp[$i]['order_id'] = $order[$i]['order_id'];
$tmp[$i]['order_sn'] = "\t".$order[$i]['order_sn']."\t";
$tmp[$i]['business_type'] = Config('params.business_type')[$order[$i]['business_type']]; // 自营其他业务类型
$tmp[$i]['user_account'] = $order[$i]['mobile'] ? $order[$i]['mobile'] : $order[$i]['email'];
// $tmp[$i]['is_new'] = $order[$i]['is_new'] == 1 ? '是' : '否'; // 是否为新用户
if ($order[$i]['order_goods_type'] == 1) {
$tmp[$i]['is_new_order'] = $order[$i]['is_new_order'] == 1 ? '是' : '否'; // 是否为新订单
......
config/params.php
......@@ -58,4 +58,10 @@
2 => 'brand_name',
3 => 'num',
],
// 特殊业务类型
'business_type' => [
1 => '样品销售',
2 => '仓库损耗',
],
];
\ No newline at end of file
public/js/add_order.js
......@@ -16,14 +16,32 @@
this.lists(internal_uid, 2, 0);
},
bind: function(goods_type, is_online, internal_uid='') { //goods_type：1-联营，2-自营 is_online：是否线上订单
businessType: function() { // 自营其他业务订单
this.bind(2, 2);
},
/**
* goods_type： is_online：是否线上订单
* @param {[type]} goods_type [1-联营，2-自营]
* @param {Boolean} is_online [0-自营线下，1-联营/自营线上，2-自营其他业务]
* @param {String} internal_uid [自营内部采购账号ID]
* @return {[type]} [description]
*/
bind: function(goods_type, is_online, internal_uid='') {
var loading = this;
// 获取用户信息
$('.get-user').click(function(){
var mobile = $(this).siblings('.search-user').val();
if (!mobile) return false;
if (!mobile) return false;
// 自营其他订单类型---仓库损耗
if (mobile == '15022222222') {
$('#business_type').val(2);
} else {
$('#business_type').val(1);
}
$.ajax({
url: '/ajax/getUserInfo',
......@@ -326,51 +344,51 @@
var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
var user_id = 0;
if (is_online) { // 线上订单
if (internal_uid) {
user_id = internal_uid;
} else {
user_id = $('.user_id').val();
}
if (!user_id) {
layer.msg('请先选择用户');
return false;
}
if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
if (!user_id) {
layer.msg('请先选择用户');
if (delivery_place == null) {
layer.msg('请选择交货地');
return false;
}
if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
if (type == 3 || type == 4) {
layer.msg('仅支持联营商品下单，请在自营订单中下单');
return false;
}
if (delivery_place == null) {
layer.msg('请选择交货地');
return false;
}
var goods_min_price = $(this).parents('.sku-info').find('.goods-min-price').text();
var goods_min_price_us = $(this).parents('.sku-info').find('.goods-min-price-us').text();
if (type == 3 || type == 4) {
layer.msg('仅支持联营商品下单，请在自营订单中下单');
if (delivery_place == 1) {
if (goods_min_price == 0) {
layer.msg('缺少RMB价格，商品添加失败');
return false;
}
var goods_min_price = $(this).parents('.sku-info').find('.goods-min-price').text();
var goods_min_price_us = $(this).parents('.sku-info').find('.goods-min-price-us').text();
if (delivery_place == 1) {
if (goods_min_price == 0) {
layer.msg('缺少RMB价格，商品添加失败');
return false;
}
} else if (delivery_place == 2) {
if (goods_min_price_us == 0) {
layer.msg('缺少美金价格，商品添加失败');
return false;
}
}
} else {
if (type == 1 || type == 2) { // 1.联营 2.专卖
layer.msg('仅支持自营商品下单，请在联营订单中下单');
} else if (delivery_place == 2) {
if (goods_min_price_us == 0) {
layer.msg('缺少美金价格，商品添加失败');
return false;
}
}
} else {
if (type == 1 || type == 2) { // 1.联营 2.专卖
layer.msg('仅支持自营商品下单，请在联营订单中下单');
return false;
}
}
user_id = internal_uid ? internal_uid : user_id;
var datax = {
uid: user_id,
id: goods_id,
......@@ -410,12 +428,12 @@
var user_id = 0;
var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
if (is_online) {
if (internal_uid) {
user_id = internal_uid;
} else {
user_id = $('.user_id').val();
}
user_id = internal_uid ? internal_uid : user_id;
if (num < min_buy) {
num = min_buy;
layer.msg('购买数量低于最小起订量，默认调整为最小起订量');
......@@ -450,12 +468,12 @@
var user_id = 0;
var delivery_place = 1; // 1.大陆，2.香港 自营默认是大陆
if (is_online) {
if (internal_uid) {
user_id = internal_uid;
} else {
user_id = $('.user_id').val();
}
user_id = internal_uid ? internal_uid : user_id;
if (goods_type == 1) { // 联营需要选择交货地
delivery_place = $('input[name=delivery_place]:checked').val();
}
......@@ -594,17 +612,17 @@
// 提交订单
$('.submit-order').click(function() {
var address_id = $('input[name=address_id]').val();
var type = $(this).data('type');
var type = $(this).data('type'); // 1-联营线上，2-自营线上，3-自营线下，4-自营其他业务
var cart_ids = [];
var user_id = 0;
var remark = $('#remark').val();
var remark = $('#remark').val(); // 订单备注
if (is_online) {
if (internal_uid) {
user_id = internal_uid;
} else {
user_id = $('.user_id').val();
}
user_id = internal_uid ? internal_uid : user_id;
$('.shop-table tbody tr').each(function() {
var cid = $(this).data('cid');
cart_ids.push(cid);
......@@ -633,10 +651,15 @@
layer.msg('请选择快递信息');
return false;
}
if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
layer.msg('请选择发票信息');
return false;
if (type == 4) { // 自营其他业务
var business_type = $('#business_type').val();
datax.business_type = business_type;
} else {
if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
layer.msg('请选择发票信息');
return false;
}
}
datax.tax_id = tax_id;
......@@ -644,10 +667,8 @@
}
// 自营线上
if (type == 2) {
var sale_type = $('#sale_type').val();
if (type == 2 && is_online == 1) {
var sale_type = $('#sale_type').val();
var cart_info = [];
$('.shop-table tbody tr').each(function() {
......
public/js/order.js
......@@ -87,6 +87,7 @@
is_new = $('#is_new').val() ? $('#is_new').val() : '';
order_payment_mode = $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order = $('#is_new_order').val() ? $('#is_new_order').val() : '';
business_type = $('#business_type').val() ? $('#business_type').val() : '';
if (url == '/export') {
if (type == 1) { // 联营
......@@ -103,12 +104,12 @@
}
} else { // 自营
if (test_order.length) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !test_order.is(':checked')) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new) {
if (!order_contain && !time_start && !time_end && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -192,6 +193,10 @@
listUrl += '&order_payment_mode=' + order_payment_mode;
}
if (business_type) {
listUrl += '&business_type=' + business_type;
}
if (test_order.is(':checked')) {
listUrl += '&test_order=' + 1;
}
......@@ -363,6 +368,7 @@
is_new : $('#is_new').val() ? $('#is_new').val() : '',
order_payment_mode : $('#order_payment_mode').val() ? $('#order_payment_mode').val() : '',
is_new_order : $('#is_new_order').val() ? $('#is_new_order').val() : '',
business_type : $('#business_type').val() ? $('#business_type').val() : '',
pid : pid,
};
......
resources/views/addOffline/content.blade.php
......@@ -78,7 +78,7 @@
<h3>商品信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="row">
<style>
.search-sku{width: 240px !important;}
......
resources/views/addOnline/content.blade.php
......@@ -216,7 +216,7 @@
<h3>商品信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="row">
<div class="col-sm-12">
<input type="text" class="search-sku" name="sku_id" value="" placeholder="请输入SKUID">
......
resources/views/addOrder/content.blade.php
......@@ -234,7 +234,7 @@
<h3>商品信息</h3>
</div>
<div class="ibox-content">
<div class="ibox-content create-order">
<div class="row">
<div class="col-sm-12">
<input type="text" class="search-sku" name="sku_id" value="" placeholder="请输入SKUID">
......
resources/views/addOtherOrder.blade.php 0 → 100644
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>订单管理后台 | {{ $title }}</title>
<script>document.domain="{{ Config::get('website.domain') }}";</script>
@include('addOffline.css')
@include('addOffline.js')
</head>
<body class="body-small">
<div id="wrapper">
<!-- layouts.navigation -->
@include('layouts.navigation')
<div id="page-wrapper" class="gray-bg">
<div class="row">
<div class="wrapper">
@include('layouts.header')
<div class="page-content">
<div class="ibox float-e-margins">
@include('addOtherOrder.content')
</div>
</div>
</div>
</div>
</div>
</div>
</body>
resources/views/detail/content.blade.php
......@@ -536,7 +536,7 @@
<tr>
<td>优惠金额：</td>
<td class="edit-parent-td">
{{$currency}}<span id="other_money">{{$order_price_info['discount_amount']}}</span>
<span id="other_money">{{$order_price_info['discount_amount']}}</span>
</td>
</tr>
@endif
......@@ -558,6 +558,15 @@
</span>
</td>
</tr>
@if (isset($order_price_info['pay_preferential']) && $order_price_info['pay_preferential'] != 0)
<tr>
<td>支付优惠：</td>
<td class="edit-parent-td">
<span id="other_money">{{$order_price_info['pay_preferential']}}</span>
</td>
</tr>
@endif
</table>
</div>
......
resources/views/selfOrder/content.blade.php
......@@ -138,6 +138,19 @@
</dd>
</dl> -->
<dl>
<dt>业务类型：</dt>
<dd>
<select id="business_type" name="business_type" class="form-control business_type selectpicker" title="全部" multiple>
@if (Config('params.business_type'))
@foreach (Config('params.business_type') as $k=>$v)
<option value="{{$k}}">{{$v}}</option>
@endforeach
@endif
</select>
</dd>
</dl>
@if (in_array('self_check_test_order', $userPerms))
<dl>
<dt></dt>
......@@ -354,6 +367,7 @@
var order_status = "{{$condition['order_status']}}";
var sale_type = "{{$condition['sale_type']}}";
var order_payment_mode = "{{$condition['order_payment_mode']}}";
var business_type = "{{$condition['business_type']}}";
var order_source_pf = "{{$condition['order_source_pf']}}";
var order_invoice_status = "{{$condition['order_invoice_status']}}";
var order_send = "{{$condition['order_send']}}";
......@@ -365,7 +379,7 @@
$('input[name=test_order]').attr('checked', true);
}
$(".order_status, .order_payment_mode, .order_source_pf").selectpicker({
$(".order_status, .order_payment_mode, .order_source_pf, .business_type").selectpicker({
actionsBox:true, //在下拉选项添加选中所有和取消选中的按钮
countSelectedText:"已选中{0}项",
selectedTextFormat:"count > 5",
......@@ -381,6 +395,7 @@
$('#order_send').selectpicker('val', order_send);
$('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
$('.business_type').selectpicker('val', business_type.split(',')).trigger("change");
$.lie.order.index();
</script>
\ No newline at end of file
resources/views/success/content.blade.php
......@@ -41,9 +41,12 @@
@elseif ($type == 2)
<a class="btn btn-success" href="/self_order">查看订单</a>
<a class="btn btn-default" href="/add_online">继续新增</a>
@else
@elseif ($type == 3)
<a class="btn btn-success" href="/self_order">查看订单</a>
<a class="btn btn-default" href="/add_offline">继续新增</a>
@else
<a class="btn btn-success" href="/self_order">查看订单</a>
<a class="btn btn-default" href="/add_other_order">继续新增</a>
@endif
</div>
</div>
......
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