Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c4319728 by 朱继来
Options

Merge branch 'zjl_group_20200303'

parents 5b9a1cd1 d56e1633
Inline Side-by-side
Showing with 466 additions and 17 deletions
app/Http/Controllers/ApiController.php
......@@ -16,6 +16,7 @@ use App\Model\OrderItemsTrackModel;
use App\Model\UserSampleApplyModel;
use App\Model\UserSampleInviteModel;
use App\Model\OrderItemsModel;
use App\Model\UserGroupModel;
class ApiController extends Controller
{
......@@ -229,4 +230,11 @@ class ApiController extends Controller
}
}
// 获取团购信息
public function ApiGroupList($request)
{
$UserGroupModel = new UserGroupModel;
$this->ExportLayui($UserGroupModel->lists($request));
}
}
app/Http/Controllers/OrderController.php
......@@ -437,6 +437,8 @@ Class OrderController extends Controller
$map['is_new'] = $request->input('is_new', '');
$map['is_new_order'] = $request->input('is_new_order', '');
$map['business_type'] = $request->input('business_type', '');
$map['order_type_extend'] = $request->input('order_type_extend', '');
$map['status_extend'] = $request->input('status_extend', '');
$perm = new PermController;
......
app/Http/Controllers/WebController.php
......@@ -301,4 +301,11 @@ class WebController extends Controller
return view('web', $data);
}
// 团购列表
public function groupList($request, $data, $id)
{
$data['title'] = '团购列表';
return view('web', $data);
}
}
app/Model/OrderModel.php
......@@ -174,6 +174,18 @@ class OrderModel extends Model
}
})
->where(function ($query) use ($map) {
// 订单类型
if (isset($map['order_type_extend'])) {
$query->where('o.order_type_extend', '=', $map['order_type_extend']);
}
})
->where(function ($query) use ($map) {
// 团购状态
if (isset($map['status_extend'])) {
$query->where('o.status_extend', '=', $map['status_extend']);
}
})
->where(function ($query) use ($map) {
// 竞调数据
if (isset($map['is_fake'])) {
$query->where('o.is_type', '=', $map['is_fake']);
......
app/Model/UserGroupJoinModel.php 0 → 100644
<?php
namespace App\Model;
use Illuminate\Database\Eloquent\Model;
use Request;
class UserGroupJoinModel extends Model
{
protected $connection = 'order';
protected $table = 'lie_user_group_join';
protected $primaryKey = 'id';
public $timestamps = false;
}
\ No newline at end of file
app/Model/UserGroupModel.php 0 → 100644
<?php
namespace App\Model;
use Illuminate\Database\Eloquent\Model;
class UserGroupModel extends Model
{
protected $connection = 'order';
protected $table = 'lie_user_group';
protected $primaryKey = 'id';
protected $guarded = ['id'];
public $timestamps = false;
// 获取客服
public function lists($request, $export='')
{
$page = $request->input('page', 1);
$limit = $request->input('limit', 10);
$map['account'] = $request->input('account', ''); // 用户账号
$map['status'] = $request->input('status', ''); // 状态
$map['begin_time'] = $request->input('begin_time', '') ? strtotime($request->input('begin_time')) : '';
$map['end_time'] = $request->input('end_time', '') ? strtotime($request->input('end_time')) + 86399 : '';
$list = $this->where(function($query) use ($map) {
// 客服名称
if ($map['account']) {
$query->where('account', 'like', $map['account'].'%');
}
})->where(function($query) use ($map) {
// 邮箱
if ($map['status']) {
$query->where('status', '=', $map['status']);
}
})->where(function($query) use ($map) {
// 创建时间
if(!empty($map['begin_time']) && !empty($map['end_time'])) {
$query->whereBetween('create_time', [$map['begin_time'], $map['end_time']]);
}
else if(!empty($map['begin_time'])) {
$query->where('create_time', '>=', $map['begin_time']);
}
else if(!empty($map['end_time'])) {
$query->where('create_time', '<=', $map['end_time']);
}
})
->orderBy('create_time', 'desc')
->orderBy('id', 'desc');
if ($export) {
$list = $list->get()->toArray();
if (empty($list)) {
echo '<script>alert("导出数据为空");history.go(-1);</script>';die;
}
return $list;
} else {
$list = $list->paginate($limit, ['*'], 'page', $page)->toArray();
$data = $this->handle($list['data']);
return [0, '获取成功', $data, $list['total']];
}
}
// 处理数据
public function handle($data)
{
if (!$data) return false;
$UserGroupJoinModel = new UserGroupJoinModel();
foreach ($data as &$v) {
// 若已参团，且非系统分配，则查询参团表
if ($v['status'] == 1) {
$join = $UserGroupJoinModel->where('group_id', $v['id'])->first();
$v['join_user_id'] = $join['user_id'];
$v['join_account'] = $join['account'];
$v['join_order_id'] = $join['order_id'];
$v['join_order_sn'] = $join['order_sn'];
$v['join_time'] = date('Y-m-d H:i:s', $join['join_time']);
} else {
$v['join_user_id'] = '';
$v['join_account'] = '';
$v['join_order_id'] = '';
$v['join_order_sn'] = '';
$v['join_time'] = '';
}
$v['limited_time'] = $v['limited_time'] ? date('Y-m-d H:i:s', $v['limited_time']) : '';
$v['create_time'] = date('Y-m-d H:i:s', $v['create_time']);
}
return $data;
}
}
\ No newline at end of file
public/js/order.js
......@@ -95,7 +95,9 @@
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() : '';
business_type = $('#business_type').val() ? $('#business_type').val() : '',
order_type_extend = $('#order_type_extend').val() ? $('#order_type_extend').val() : '',
status_extend = $('#status_extend').val() ? $('#status_extend').val() : '';
if (url == '/export') {
if (type == 1) { // 联营
......@@ -112,12 +114,12 @@
}
} else { // 自营
if (test_order.length) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !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')) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !order_type_extend && !status_extend && !test_order.is(':checked')) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
} else {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type) {
if (!order_contain && !order_sn && !erp_sn && !goods_name && !time_start && !time_end && !order_pay_type && !order_payment_mode && !order_status && !sale_type && !order_invoice_status && !order_source_pf && !order_source_adtag && !order_source_ptag && !is_new && !business_type && !order_type_extend && !status_extend) {
layer.msg('请选择筛选条件，再导出！');
return false;
}
......@@ -221,6 +223,14 @@
listUrl += '&business_type=' + business_type;
}
if (order_type_extend) {
listUrl += '&order_type_extend=' + order_type_extend;
}
if (status_extend) {
listUrl += '&status_extend=' + status_extend;
}
if (test_order.is(':checked')) {
listUrl += '&test_order=' + 1;
}
......
public/js/web/groupList.js 0 → 100644
layui.use(['form', 'table', 'laydate'], function(){
var form = layui.form;
var table = layui.table;
var laydate = layui.laydate;
laydate.render({
elem: '#begin_time' //指定元素
});
laydate.render({
elem: '#end_time' //指定元素
});
var renderTable = function () {
table.render({
id: 'list'
,elem: '#list'
,url: '/api/ApiGroupList' //数据接口
,method:'post'
,cellMinWidth: 80 //全局定义常规单元格的最小宽度
,page: true //开启分页
,cols: [[ //表头
{title: '序号', type: 'numbers', fixed: 'left', width: 80}
,{field: 'user_id', title: '用户ID', width: 100}
,{field: 'account', title: '用户账号', width: 150}
,{field: 'order_id', title: '订单ID', width: 100}
,{field: 'order_sn', title: '订单号', width: 150}
,{field: 'status', title: '参团状态', templet: '#status', width: 100}
,{field: 'is_assign', title: '是否系统分配', templet: '#is_assign', width: 150}
,{field: 'join_user_id', title: '参团用户ID', width: 120}
,{field: 'join_account', title: '参团用户账号', width: 150}
,{field: 'join_order_id', title: '参团订单ID', width: 120}
,{field: 'join_order_sn', title: '参团订单号', width: 150}
,{field: 'join_time', title: '参团时间', width: 180}
,{field: 'limited_time', title: '团购限时时间', width: 180}
,{field: 'create_time', title: '创建时间', width: 180}
]]
,limit: 10
,limits: [10, 20, 50,]
});
};
renderTable();
form.on('submit(load)', function(data) {
//执行重载
table.reload('list', {
page: {
curr: 1
}
,where: data.field
});
return false;
});
$('.add').click(function() {
layer.open({
area: ['400px', '200px'],
title: '新增客服',
type: 1,
content: $('#kefu-action'),
btn: ['确认', '取消'],
yes: function(index) {
var email = $('.kefu-email').val();
if (!email) {
layer.tips('请输入邮箱', $('.kefu-email'));
return false;
}
$.ajax({
url : '/api/ApiAddKefu',
type: 'post',
data: {email: email},
dataType: 'json',
success: function(resp) {
if (resp.errcode == 0) {
layer.close(index);
layer.msg(resp.errmsg);
renderTable(); // 重新加载table
return false;
}
layer.msg(resp.errmsg);
},
error: function(err) {
console.log(err)
}
})
layer.msg('新增客服中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
return false;
},
cancel: function(index) {
layer.close(index);
}
})
$('.kefu-email').val('');
})
// tool操作
table.on('tool(kefu)', function(obj){ //注：tool是工具条事件名，test是table原始容器的属性lay-filter="对应的值"
var data = obj.data; //获得当前行数据
var layEvent = obj.event; //获得 lay-event 对应的值（也可以是表头的 event 参数对应的值）
var url = '';
var title = '';
var content = '';
var datax = {};
datax.id = data.id;
if(layEvent === 'edit') {
url = '/api/ApiEditKefu';
title = '编辑客服';
content = $('#kefu-action');
} else if (layEvent === 'del') {
url = '/api/ApiDelKefu';
title = '删除客服';
content = '<div style="margin: 40px;">确定删除该客服吗？</div>';
datax.status = data.status;
} else if (layEvent === 'top') {
url = '/api/ApiTopKefu';
title = '置顶客服';
content = '<div style="margin: 40px;">确定置顶该客服吗？</div>';
}
layer.open({
area: ['400px', '200px'],
title: title,
type: 1,
content: content,
btn: ['确认', '取消'],
yes: function(index) {
if (layEvent == 'edit') {
var email = $('.kefu-email').val();
if (!email) {
layer.tips('请输入邮箱', $('.kefu-email'));
return false;
}
datax.email = email;
}
$.ajax({
url : url,
type: 'post',
data: datax,
dataType: 'json',
success: function(resp) {
if (resp.errcode == 0) {
layer.close(index);
layer.msg(resp.errmsg);
renderTable(); // 重新加载table
return false;
}
layer.msg(resp.errmsg);
},
error: function(err) {
console.log(err)
}
})
layer.msg(title+'中...', {icon: 16, time: 0, shade: 0.3}); // 阻止重复提交
return false;
},
cancel: function(index) {
layer.close(index);
}
})
if (layEvent == 'edit') {
$('.kefu-email').val(data.email);
}
});
});
\ No newline at end of file
resources/views/detail/content.blade.php
......@@ -30,8 +30,12 @@
?>
<tr>
@if ($order_info['order_type_extend'])
<th>订单类型</th>
@endif
@if ($order_info['order_goods_type'] == 2)
<th>订单类型</th>
<th>销售类型</th>
@endif
@if ($order_temp_info['business_type'])
......@@ -51,6 +55,16 @@
</tr>
<tr>
@if ($order_info['order_type_extend'])
<td>
<?php
switch ($order_info['order_type_extend']) {
case 1: echo '团购订单'; break;
}
?>
</td>
@endif
@if ($order_info['order_goods_type'] == 2)
<td>{{ $order_info['sale_type'] == 1 ? '现卖' : '预售' }}</td>
@endif
......@@ -660,8 +674,12 @@
@if ($order_price_info['new_client_price'] != 0)
<tr>
<td>新客价优惠:</td>
<td>{{$currency}}<span id="order-total" class="amount">{{$order_price_info['new_client_price']}}</span></td>
@if ($order_info['order_type_extend'] == 1)
<td>团购优惠：</td>
@else
<td>新客价优惠：</td>
@endif
<td><span id="order-total" class="amount">{{$order_price_info['new_client_price']}}</span></td>
</tr>
@endif
......
resources/views/selfOrder/content.blade.php
......@@ -214,6 +214,29 @@
</dd>
</dl>
<dl>
<dt>订单类型：</dt>
<dd>
<select id="order_type_extend" name="order_type_extend" class="form-control order_type_extend selectpicker" title="全部">
<option value="">全部</option>
<option value="0">普通订单</option>
<option value="1">团购订单</option>
</select>
</dd>
</dl>
<dl>
<dt>团购状态：</dt>
<dd>
<select id="status_extend" name="status_extend" class="form-control status_extend selectpicker" title="全部">
<option value="">全部</option>
<option value="-16">团购失败</option>
<option value="10">团购中</option>
<option value="16">团购完成</option>
</select>
</dd>
</dl>
@if (in_array('self_check_test_order', $userPerms))
<dl>
<dt></dt>
......@@ -291,17 +314,25 @@
</td>
<td class="show-list">
<?php
switch ($v['status']) {
case -2: echo '<span class="list-text-no-check"><b>审核未通过</b></span>';break;
case -1: echo '<span class="list-text-cancel"><b>已取消</b></span>';break;
case 1: echo '<span class="list-text-checking"><b>待审核</b></span>';break;
case 2: echo '<span class="list-text-pay"><b>待付款</b></span>';break;
case 3: echo '<span class="list-text-last-pay"><b>待付尾款</b></span>';break;
case 4: echo '<span class="list-text-send"><b>待发货</b></span>';break;
case 7: echo '<span class="list-text-send"><b>部分发货</b></span>';break;
case 8: echo '<span class="list-text-confirm"><b>待收货</b></span>';break;
case 10: echo '<span class="list-text-success"><b>交易成功</b></span>';break;
}
if ($v['order_type_extend'] == 1 && $v['status'] <= 4) { // 团购订单状态
switch ($v['status_extend']) {
case -16: echo '<span class="list-text-cancel"><b>团购失败</b></span>';break;
case 10: echo '<span class="list-text-send"><b>团购中</b></span>';break;
case 16: echo '<span class="list-text-success"><b>团购成功</b></span>';break;
}
} else {
switch ($v['status']) {
case -2: echo '<span class="list-text-no-check"><b>审核未通过</b></span>';break;
case -1: echo '<span class="list-text-cancel"><b>已取消</b></span>';break;
case 1: echo '<span class="list-text-checking"><b>待审核</b></span>';break;
case 2: echo '<span class="list-text-pay"><b>待付款</b></span>';break;
case 3: echo '<span class="list-text-last-pay"><b>待付尾款</b></span>';break;
case 4: echo '<span class="list-text-send"><b>待发货</b></span>';break;
case 7: echo '<span class="list-text-send"><b>部分发货</b></span>';break;
case 8: echo '<span class="list-text-confirm"><b>待收货</b></span>';break;
case 10: echo '<span class="list-text-success"><b>交易成功</b></span>';break;
}
}
?>
</td>
<td class="show-list"> {{ Config('params.order_pay_type')[$v['order_pay_type']] }} </td>
......@@ -417,6 +448,8 @@
var order_send = "{{$condition['order_send']}}";
var order_pay_type = "{{$condition['order_pay_type']}}";
var is_new = "{{$condition['is_new']}}";
var order_type_extend = "{{$condition['order_type_extend']}}";
var status_extend = "{{$condition['status_extend']}}";
var manager = "{{$role}}";
if (test_order) {
......@@ -441,6 +474,8 @@
// $('.order_pay_type').selectpicker('val', order_pay_type.split(',')).trigger("change");
$('.order_pay_type').selectpicker('val', order_pay_type);
$('.is_new').selectpicker('val', is_new.split(',')).trigger("change");
$('.order_type_extend').selectpicker('val', order_type_extend.split(',')).trigger("change");
$('.status_extend').selectpicker('val', status_extend.split(',')).trigger("change");
$('.business_type').selectpicker('val', business_type.split(',')).trigger("change");
$.lie.order.index();
......
resources/views/web/groupList.blade.php 0 → 100644
<form class="layui-form layui-box" method="post">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">用户账号</label>
<div class="layui-input-inline">
<input type="text" name="account" placeholder="填写用户账号" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">参团状态</label>
<div class="layui-input-inline">
<select name="status" lay-verify="" lay-search>
<option value=""></option>
<option value="1">已参团</option>
<option value="-1">未参团</option>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">创建时间</label>
<div class="layui-input-inline">
<input type="text" name="begin_time" value="" autocomplete="off" placeholder="选择开始时间" class="layui-input" id="begin_time" readonly>
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline">
<input type="text" name="end_time" value="" autocomplete="off" placeholder="选择结束时间" class="layui-input" id="end_time" readonly>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-btn-container" style="text-align: center; margin-top: 10px;">
<button lay-submit lay-filter="load" class="layui-btn" data-type="search">搜索</button>
<!-- <button type="button" class="layui-btn layui-btn-normal export">导出</button> -->
</div>
</div>
</form>
<table id="list" lay-filter="list"></table>
<script type="text/html" id="status">
@{{# if (d.status == 1) { }}
<div style="color:green;">已参团</div>
@{{# } else { }}
<div style="color:#ccc;">未参团</div>
@{{# } }}
</script>
<script type="text/html" id="is_assign">
@{{# if (d.is_assign == 1) { }}
<div style="color:green;">是</div>
@{{# } else { }}
<div style="color:#ccc;">否</div>
@{{# } }}
</script>
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