Skip to content

朱继来 / 后台订单管理

Go to a project
Commit f1360c56 by 朱继来
Options

Merge branch 'zjl_order_limit_20220218'

parents 30c3a842 22a1aed7
Expand all
Inline Side-by-side
Showing with 84 additions and 32 deletions
app/Http/Controllers/AddOrderController.php
...@@ -259,11 +259,12 @@ Class AddOrderController extends Controller ...@@ -259,11 +259,12 @@ Class AddOrderController extends Controller
// 选择发票信息 // 选择发票信息
public function selectInv(Request $request) public function selectInv(Request $request)
{ {
if ($request->isMethod('post')) {
$tax_id = $request->input('tax_id'); $tax_id = $request->input('tax_id');
$invoice = TaxInfoModel::where('tax_id', $tax_id)->first(); $invoice = TaxInfoModel::where('tax_id', $tax_id)->first();
if (!$invoice) return ['errcode' => 0, 'errmsg' => ''];
$invoice->province_val = $invoice->consignee_province ? $this->getAddress($invoice->consignee_province) : ''; $invoice->province_val = $invoice->consignee_province ? $this->getAddress($invoice->consignee_province) : '';
$invoice->city_val = $invoice->consignee_city ? $this->getAddress($invoice->consignee_city) : ''; $invoice->city_val = $invoice->consignee_city ? $this->getAddress($invoice->consignee_city) : '';
$invoice->district_val = $invoice->consignee_district ? $this->getAddress($invoice->consignee_district) : ''; $invoice->district_val = $invoice->consignee_district ? $this->getAddress($invoice->consignee_district) : '';
...@@ -273,17 +274,20 @@ Class AddOrderController extends Controller ...@@ -273,17 +274,20 @@ Class AddOrderController extends Controller
$company_info = InvoiceCompanyModel::where('com_name', $invoice->tax_title)->first(); $company_info = InvoiceCompanyModel::where('com_name', $invoice->tax_title)->first();
if ($company_info) { if ($company_info) {
if ($company_info['company_category'] == 3) return ['errcode'=>1, 'errmsg'=>'该客户为黑名单客户，禁止下单！'];
$invoice->customer_en = $company_info->customer_en; $invoice->customer_en = $company_info->customer_en;
$invoice->customer_type = $company_info->customer_type; $invoice->customer_type = $company_info->customer_type;
$invoice->product_use_classone_sn = $company_info->product_use_classone_sn; $invoice->product_use_classone_sn = $company_info->product_use_classone_sn;
$invoice->product_use_classtwo_sn = $company_info->product_use_classtwo_sn; $invoice->product_use_classtwo_sn = $company_info->product_use_classtwo_sn;
$invoice->customer_website = $company_info->customer_website; $invoice->customer_website = $company_info->customer_website;
if ($company_info['company_category'] == 4) return ['errcode'=>2, 'errmsg'=>'该客户为实体名单客户，是否继续下单！', 'data'=>$invoice];
} }
} }
return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice]; return ['errcode' => 0, 'errmsg' => '', 'data' => $invoice];
} }
}
// 根据发票类型选择发票信息 // 根据发票类型选择发票信息
public function selectInvType(Request $request) public function selectInvType(Request $request)
...@@ -695,7 +699,6 @@ Class AddOrderController extends Controller ...@@ -695,7 +699,6 @@ Class AddOrderController extends Controller
// 提交订单 // 提交订单
public function create(Request $request) public function create(Request $request)
{ {
if ($request->isMethod('post')) {
$data['type'] = $request->input('type'); $data['type'] = $request->input('type');
$data['inv_com_id'] = $request->input('inv_com_id', 0); $data['inv_com_id'] = $request->input('inv_com_id', 0);
$data['uid'] = $request->input('uid'); $data['uid'] = $request->input('uid');
...@@ -763,7 +766,6 @@ Class AddOrderController extends Controller ...@@ -763,7 +766,6 @@ Class AddOrderController extends Controller
return ['errcode'=>$response['err_code'], 'errmsg'=>$response['err_msg'], 'data'=>['order_id'=>$response['data'], 'type'=>$data['type']]]; return ['errcode'=>$response['err_code'], 'errmsg'=>$response['err_msg'], 'data'=>['order_id'=>$response['data'], 'type'=>$data['type']]];
} }
}
// 提交订单成功页面 // 提交订单成功页面
public function success(Request $request) public function success(Request $request)
......
app/Http/Controllers/OrderController.php
...@@ -919,6 +919,7 @@ Class OrderController extends Controller ...@@ -919,6 +919,7 @@ Class OrderController extends Controller
if ($count > $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户']; if ($count > $order_user_limit) return ['errcode'=>11001, 'errmsg'=>'你已达到成交用户上限，请先释放你跟进的已下单用户或联系主管重新分配当前用户'];
} }
if ($request->user->email != 'admin@ichunt.com') {
$perm = new PermController; $perm = new PermController;
$OrderModel = new OrderModel; $OrderModel = new OrderModel;
$relation_id = []; $relation_id = [];
...@@ -940,6 +941,7 @@ Class OrderController extends Controller ...@@ -940,6 +941,7 @@ Class OrderController extends Controller
// 校验此是否为此订单销售或者对应主管，总监 // 校验此是否为此订单销售或者对应主管，总监
if (!in_array($request->user->userId, $relation_id)) return ['errcode'=>-1, 'errmsg'=>'你没有权限操作此销售订单！']; if (!in_array($request->user->userId, $relation_id)) return ['errcode'=>-1, 'errmsg'=>'你没有权限操作此销售订单！'];
}
if (!$request->input('pay_time_limit')) { if (!$request->input('pay_time_limit')) {
$payTime = $request->input('payTime', ''); $payTime = $request->input('payTime', '');
......
app/Model/InvoiceCompanyModel.php
...@@ -8,8 +8,8 @@ use DB; ...@@ -8,8 +8,8 @@ use DB;
class InvoiceCompanyModel extends Model class InvoiceCompanyModel extends Model
{ {
protected $connection = 'web'; protected $connection = 'crm';
protected $table = 'lie_invoice_company'; protected $table = 'invoice_company';
protected $primaryKey = 'id'; protected $primaryKey = 'id';
public $timestamps = false; public $timestamps = false;
......
public/js/add_order.js
...@@ -259,8 +259,31 @@ ...@@ -259,8 +259,31 @@
data: {tax_id : tax_id}, data: {tax_id : tax_id},
dataType: 'json', dataType: 'json',
success: function (resp) { success: function (resp) {
if (resp.errcode == 0) { if (resp.errcode == 1) {
var data = resp.data; layer.alert(resp.errmsg);
return false;
}
if (resp.errcode == 2) {
layer.confirm(resp.errmsg, function (index) {
addInvoiceInfo(resp.data)
layer.close(index)
});
return false;
}
addInvoiceInfo(resp.data)
}
})
} else {
$('.invoice-content').hide();
$('.tax_id').val('');
}
})
// 添加发票信息
function addInvoiceInfo(data)
{
var inv_type_val = ''; var inv_type_val = '';
$('.invoice-content').show(); $('.invoice-content').show();
...@@ -305,15 +328,7 @@ ...@@ -305,15 +328,7 @@
layer.msg('购物车中存在digikey商品，请选择增值税普票或专票'); layer.msg('购物车中存在digikey商品，请选择增值税普票或专票');
} }
} }
}
} }
})
} else {
$('.invoice-content').hide();
$('.tax_id').val('');
}
})
// 获取SKU信息 // 获取SKU信息
$('.get-sku').click(function() { $('.get-sku').click(function() {
...@@ -762,11 +777,42 @@ ...@@ -762,11 +777,42 @@
// 提交订单 // 提交订单
// $('.submit-order').on('click', function() { // $('.submit-order').on('click', function() {
$('.submit-order').off().on('click', function() { $('.submit-order').off().on('click', function () {
var self = $(this); var tax_id = $('.tax_id').val();
if (tax_id) {
$.ajax({
url: '/ajax/selectInv',
type: 'post',
data: { tax_id: tax_id },
dataType: 'json',
success: function (resp) {
if (resp.errcode == 1) {
layer.alert(resp.errmsg);
return false;
}
if (resp.errcode == 2) {
layer.confirm(resp.errmsg, function (index) {
createOrder();
layer.close(index)
});
return false;
}
createOrder();
}
})
} else {
createOrder();
}
})
function createOrder() {
var shipping_type = $('#shipping_type').val(); // 配送方式 var shipping_type = $('#shipping_type').val(); // 配送方式
var address_id = $('input[name=address_id]').val(); var address_id = $('input[name=address_id]').val();
var type = self.data('type'); // 1-联营线上，2-自营线上，3-自营线下，4-自营其他业务 var type = $('.submit-order').data('type'); // 1-联营线上，2-自营线上，3-自营线下，4-自营其他业务
var cart_ids = []; var cart_ids = [];
var user_id = 0; var user_id = 0;
var remark = $('#remark').val(); // 订单备注 var remark = $('#remark').val(); // 订单备注
...@@ -780,7 +826,7 @@ ...@@ -780,7 +826,7 @@
var is_dgk = false; var is_dgk = false;
$('.shop-table tbody tr').each(function() { $('.shop-table tbody tr').each(function () {
var cid = $(this).data('cid'); var cid = $(this).data('cid');
cart_ids.push(cid); cart_ids.push(cid);
...@@ -846,7 +892,7 @@ ...@@ -846,7 +892,7 @@
return false; return false;
} }
if ((typeof(inv_type) == 'undefined' || inv_type != '') && !tax_id) { if ((typeof (inv_type) == 'undefined' || inv_type != '') && !tax_id) {
layer.msg('请选择发票信息'); layer.msg('请选择发票信息');
return false; return false;
} }
...@@ -923,11 +969,11 @@ ...@@ -923,11 +969,11 @@
var sale_type = $('#sale_type').val(); var sale_type = $('#sale_type').val();
var cart_info = []; var cart_info = [];
$('.shop-table tbody tr').each(function() { $('.shop-table tbody tr').each(function () {
var gid = $(this).find('.goods_id').text(); var gid = $(this).find('.goods_id').text();
var num = $(this).find('.goods_num').val(); var num = $(this).find('.goods_num').val();
cart_info.push({'gid':gid, 'num':num}); cart_info.push({ 'gid': gid, 'num': num });
}) })
datax.role = role; // 自营线上下单添加角色 datax.role = role; // 自营线上下单添加角色
...@@ -935,17 +981,17 @@ ...@@ -935,17 +981,17 @@
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: '/ajax/checkStock', url: '/ajax/checkStock',
data: {cart_info: JSON.stringify(cart_info), sale_type: sale_type}, data: { cart_info: JSON.stringify(cart_info), sale_type: sale_type },
dataType: "json", dataType: "json",
async: false, async: false,
success: function(resp){ success: function (resp) {
if (resp.errcode == -1) { if (resp.errcode == -1) {
var data = eval(resp.data); var data = eval(resp.data);
var content = '<p>'+resp.errmsg+'</p>'; var content = '<p>' + resp.errmsg + '</p>';
submit = false; submit = false;
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
content += '<p><span>'+(i+1)+'、</span>'+data[i]['goods_name']+'，可用库存：'+data[i]['stock']+'</p>'; content += '<p><span>' + (i + 1) + '、</span>' + data[i]['goods_name'] + '，可用库存：' + data[i]['stock'] + '</p>';
} }
// 弹出提示 // 弹出提示
...@@ -970,17 +1016,17 @@ ...@@ -970,17 +1016,17 @@
url: '/ajax/create', url: '/ajax/create',
data: datax, data: datax,
dataType: "json", dataType: "json",
success: function(resp){ success: function (resp) {
if (resp.errcode == 0) { if (resp.errcode == 0) {
layer.msg(resp.errmsg); layer.msg(resp.errmsg);
location.href = '/addorder/success?order_id='+resp.data.order_id+'&type='+resp.data.type; location.href = '/addorder/success?order_id=' + resp.data.order_id + '&type=' + resp.data.type;
return false; return false;
} else if (resp.errcode == 21024) { } else if (resp.errcode == 21024) {
layer.alert('该用户已进入公司黑名单，具体请联系吴承义，同时订单无法提交'); layer.alert('该用户已进入公司黑名单，具体请联系吴承义，同时订单无法提交');
return false; return false;
} else if (resp.errcode == 21030) { } else if (resp.errcode == 21030) {
layer.alert(resp.errmsg, function() { layer.alert(resp.errmsg, function () {
var delivery_place = $('.delivery_place').val(); var delivery_place = $('.delivery_place').val();
loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表 loading.lists(user_id, goods_type, is_online, delivery_place); // 加载购物车列表
...@@ -994,12 +1040,13 @@ ...@@ -994,12 +1040,13 @@
}, },
}) })
layer.msg('订单生成中...', {icon: 16, time: 0, shade: 0.3}); layer.msg('订单生成中...', { icon: 16, time: 0, shade: 0.3 });
} }
} else { } else {
layer.msg('请先添加商品'); layer.msg('请先添加商品');
} }
}) }
// 发货方式 // 发货方式
$('.zy_delivery_type').change(function() { $('.zy_delivery_type').change(function() {
......
resources/views/changeOrder/content.blade.php
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<input type="hidden" name="check_failed_info" value=""> <input type="hidden" name="check_failed_info" value="">
<input type="hidden" name="change_pay_type" value=""> <input type="hidden" name="change_pay_type" value="">
<input type="hidden" name="business_type" value="{{$order_temp_info['business_type']}}"> <input type="hidden" name="business_type" value="{{$order_temp_info['business_type']}}">
<input type="hidden" class="tax_id" name="tax_id" value="{{ isset($order_invoice_info['tax_id']) ? $order_invoice_info['tax_id'] : '' }}">
<?php $isNewClient = App\Http\Controllers\isNewClient($order_info['order_goods_type'], $order_info['user_id'], $order_info['create_time']); ?> <?php $isNewClient = App\Http\Controllers\isNewClient($order_info['order_goods_type'], $order_info['user_id'], $order_info['create_time']); ?>
@if ($isNewClient) @if ($isNewClient)
......
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