hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单异常

Browse Source
This commit is contained in:
todaywindy 2025-05-29 20:10:20 +08:00
parent 4b83b571f1
commit e3457cbc12
8 changed files with 64 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/admin/controller/Index.php
View File

@ -39,11 +39,13 @@ class Index extends Backend
config('fastadmin.' . $key, $cookieValue); config('fastadmin.' . $key, $cookieValue);
} }
} }
$order = new \app\admin\model\Order();
$to_dispatch = $order->where('status',\app\admin\model\Order::STATUS_DISPATCHING)->count();
//左侧菜单 //左侧菜单
list($menulist, $navlist, $fixedmenu, $referermenu) = $this->auth->getSidebar([ list($menulist, $navlist, $fixedmenu, $referermenu) = $this->auth->getSidebar([
'dashboard' => 'hot', 'order/index' => [$to_dispatch, 'red', 'badge'], //待派单
'addon' => ['new', 'red', 'badge'],
'auth/rule' => __('Menu'),
], $this->view->site['fixedpage']); ], $this->view->site['fixedpage']);
$action = $this->request->request('action'); $action = $this->request->request('action');
if ($this->request->isPost()) { if ($this->request->isPost()) {

4
application/admin/controller/Message.php
View File

@ -129,7 +129,7 @@ class Message extends Backend
{ {
$count = 0; $count = 0;
//超管不提醒新消息 //超管不提醒新消息
if(!$this->auth->isSuperAdmin()){ // if(!$this->auth->isSuperAdmin()){
$count = $this->model $count = $this->model
->where('type',1) ->where('type',1)
->auth($this->auth) ->auth($this->auth)
@ -137,7 +137,7 @@ class Message extends Backend
->whereRaw("FIND_IN_SET({$this->auth->id}, read_uid) = 0 OR read_uid = '' or read_uid is null") ->whereRaw("FIND_IN_SET({$this->auth->id}, read_uid) = 0 OR read_uid = '' or read_uid is null")
->whereTime('create_time', '>=', '-30 days') ->whereTime('create_time', '>=', '-30 days')
->count(); ->count();
} // }
return [ return [
'count' => $count 'count' => $count
]; ];

20
application/admin/controller/Order.php
View File

@ -4,6 +4,7 @@ namespace app\admin\controller;
use app\admin\addresmart\Address; use app\admin\addresmart\Address;
use app\admin\controller\orders\DispatchLogic; use app\admin\controller\orders\DispatchLogic;
use app\admin\model\Message;
use app\admin\model\order\Invoice; use app\admin\model\order\Invoice;
use app\admin\model\OrderDispatch; use app\admin\model\OrderDispatch;
use app\admin\model\Worker; use app\admin\model\Worker;
@ -194,6 +195,9 @@ class Order extends Backend
return $this->view->fetch(); return $this->view->fetch();
} }
$params = $this->request->post('row/a'); $params = $this->request->post('row/a');
$params = array_filter($params,function ($val){
return $val != '';
});
if (empty($params)) { if (empty($params)) {
$this->error(__('Parameter %s can not be empty', '')); $this->error(__('Parameter %s can not be empty', ''));
} }
@ -412,6 +416,14 @@ class Order extends Backend
if ($ids) { if ($ids) {
$order = $this->model->where('id', $ids)->find(); $order = $this->model->where('id', $ids)->find();
} }
Message::create([
'to_id' => $order->admin_id,
'type' => 1,
'title' => '订单报错通知',
'content' => '【订单报错通知】您有一条订单号为'.$order->order_no.'的订单订单信息录入错误，请前往报错订单界面进行查看，并立即处理！'
]);
$this->success($order['order_no']); $this->success($order['order_no']);
} }
@ -433,6 +445,7 @@ class Order extends Backend
} }
$params = $this->preExcludeFields($params); $params = $this->preExcludeFields($params);
$order = model('order')->get($params['order_id']);
$result = false; $result = false;
Db::startTrans(); Db::startTrans();
@ -450,6 +463,13 @@ class Order extends Backend
'update_time' => now()->format('Y-m-d H:m:s'), 'update_time' => now()->format('Y-m-d H:m:s'),
]; ];
Message::create([
'to_id' => $order->admin_id,
'type' => 1,
'title' => '订单报错通知',
'content' => '【订单报错通知】您有一条订单号为'.$order->order_no.'的订单订单信息录入错误，请前往报错订单界面进行查看，并立即处理！'
]);
$result = \model('order_abnormal')->insert($insert); $result = \model('order_abnormal')->insert($insert);
Db::commit(); Db::commit();
} catch (ValidateException | PDOException | Exception $e) { } catch (ValidateException | PDOException | Exception $e) {

12
application/admin/controller/aftersales/Aftersale.php
View File

@ -3,6 +3,7 @@
namespace app\admin\controller\aftersales; namespace app\admin\controller\aftersales;
use app\admin\model\Admin; use app\admin\model\Admin;
use app\admin\model\Message;
use app\admin\model\Order; use app\admin\model\Order;
use app\common\controller\Backend; use app\common\controller\Backend;
use app\common\Logic\OrderLogic; use app\common\Logic\OrderLogic;
@ -157,8 +158,8 @@ class Aftersale extends Backend
$params['admin_id'] = $this->auth->id; $params['admin_id'] = $this->auth->id;
$params['admin_user'] = $this->auth->nickname; $params['admin_user'] = $this->auth->nickname;
if(!empty($order->dispatch)){ if(!empty($order->dispatch)){
$params['worker_id'] = $order->dispatch->worker_id; $params['worker_id'] = $order->dispatch->worker_id ?? 0;
$params['worker_name'] = $order->dispatch->worker_name; $params['worker_name'] = $order->dispatch->worker_name ?? '';
} }
$params['status'] = 1; $params['status'] = 1;
@ -171,6 +172,13 @@ class Aftersale extends Backend
$params['dispatch_admin_id'] = $order->dispatch_admin_id ?? 0; $params['dispatch_admin_id'] = $order->dispatch_admin_id ?? 0;
$params['dispatch_admin_user'] = $order->dispatch_admin_user ?? ''; $params['dispatch_admin_user'] = $order->dispatch_admin_user ?? '';
Message::create([
'to_id' => $params['dispatch_admin_id'],
'type' => 1,
'title' => '订单报错通知',
'content' => '【售后申请通知】您有一条售后申请待处理，请前往订单售后界面进行处理！'
]);
$result = $this->model->allowField(true)->save($params); $result = $this->model->allowField(true)->save($params);
$order->aftersale_id = $this->model->id; $order->aftersale_id = $this->model->id;
$order->save(); $order->save();

42
application/admin/view/order/add.html
View File

@ -7,14 +7,14 @@
<div> <div>
<div class="card-body"> <div class="card-body">
<form id="add-form" class="row" role="form" data-toggle="validator" method="POST" action=""> <form id="add-form" class="row" role="form" data-toggle="validator" method="POST" action="">
<div class="col-lg-4"> <div class="col-lg-4 col-xs-12 col-md-6">
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Customer')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Customer')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-customer" data-rule="required" class="form-control" name="row[customer]" type="text"> <input id="c-customer" data-rule="required" class="form-control" name="row[customer]" type="text">
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Tel')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Tel')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-tel" data-rule="required" class="form-control" name="row[tel]" type="number"> <input id="c-tel" data-rule="required" class="form-control" name="row[tel]" type="number">
@ -22,15 +22,15 @@
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Area_id')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Area_id')}:</label>
<div class='col-xs-12 col-sm-8'> <div class='col-xs-12 col-sm-8'>
<input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" type="text" value="" /> <input id="c-city" data-rule="required" class="form-control" data-toggle="city-picker" type="text" value="" />
<input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" /> <input id="area_id" style="display: none" class="form-control" name="row[area_id]" hidden type="text" value="" />
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-md-4">{:__('Address')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Address')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="myform-group"> <div class="myform-group">
<input id="c-address" data-rule="required" <input id="c-address" data-rule="required"
@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Item_title')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Item_title')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input type="text" id="item_id" class="zd-input__inner"> <input type="text" id="item_id" class="zd-input__inner">
@ -60,14 +60,14 @@
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Detail')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Detail')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<textarea id="c-detail" placeholder="待填" rows="8" style="width: 100%;resize: vertical" class="form-control" name="row[detail]"></textarea> <textarea id="c-detail" placeholder="待填" rows="8" style="width: 100%;resize: vertical" class="form-control" name="row[detail]"></textarea>
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">上门时间: <label class="control-label col-xs-12 col-lg-4">上门时间:
</label> </label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -75,7 +75,7 @@
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Images')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Images')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<div class="input-group"> <div class="input-group">
@ -91,9 +91,9 @@
</div> </div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4 col-xs-12 col-md-6">
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Source')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Source')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select id="c-source" data-live-search="true" title="请选择" data-rule="required" name="row[source]" class="form-control selectpicker show-tick"> <select id="c-source" data-live-search="true" title="请选择" data-rule="required" name="row[source]" class="form-control selectpicker show-tick">
@ -106,14 +106,14 @@
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">来源订单ID:</label> <label class="control-label col-xs-12 col-lg-4">来源订单ID:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input id="c-source-id" name="row[source_uid]" type="text" class="form-control"> <input id="c-source-id" name="row[source_uid]" type="text" class="form-control">
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">派单方式:</label> <label class="control-label col-xs-12 col-lg-4">派单方式:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select data-live-search="true" name="row[dispatch_type]" class="form-control selectpicker show-tick"> <select data-live-search="true" name="row[dispatch_type]" class="form-control selectpicker show-tick">
@ -124,7 +124,7 @@
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">收款方式:</label> <label class="control-label col-xs-12 col-lg-4">收款方式:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select name="row[receive_type]" class="form-control selectpicker"> <select name="row[receive_type]" class="form-control selectpicker">
@ -134,7 +134,7 @@
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">收款金额:</label> <label class="control-label col-xs-12 col-lg-4">收款金额:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<input data-rule="required" name="row[online_amount]" class="form-control" type="number"> <input data-rule="required" name="row[online_amount]" class="form-control" type="number">
@ -143,7 +143,7 @@
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Coupons')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Coupons')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select id="c-coupon" data-live-search="true" title="请选择" data-rule="required" name="row[coupon_id]" class="form-control selectpicker show-tick"> <select id="c-coupon" data-live-search="true" title="请选择" data-rule="required" name="row[coupon_id]" class="form-control selectpicker show-tick">
@ -154,7 +154,7 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">录单员:</label> <label class="control-label col-xs-12 col-lg-4">录单员:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select id="c-users" data-live-search="true" title="不选择默认当前登陆账号" name="row[admin_id]" class="form-control selectpicker show-tick"> <select id="c-users" data-live-search="true" title="不选择默认当前登陆账号" name="row[admin_id]" class="form-control selectpicker show-tick">
@ -166,7 +166,7 @@
</div> </div>
</div> </div>
<div class="form-group col-xs-12"> <div class="form-group">
<label class="control-label col-xs-12 col-lg-4">{:__('Remark')}:</label> <label class="control-label col-xs-12 col-lg-4">{:__('Remark')}:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
@ -182,7 +182,7 @@
</div> </div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4 col-xs-12 col-md-6">
<h5 class=" col-md-12 text-left">快速输入:</h5> <h5 class=" col-md-12 text-left">快速输入:</h5>
<div class="col-md-12"> <div class="col-md-12">
<div class="form-floating"> <div class="form-floating">
@ -235,7 +235,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-start; align-items: flex-start;
height: 100vh; height: calc(100vh - 70px);
overflow-y: auto; overflow-y: auto;
} }
.function-area { .function-area {

4
application/admin/view/order/delete.html
View File

@ -14,7 +14,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">作废原因:</label> <label class="control-label col-xs-12 col-sm-2">取消原因:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<select id="c-coupon" title="请选择" data-rule="required" name="row[cancel_reason_id]" class="form-control"> <select id="c-coupon" title="请选择" data-rule="required" name="row[cancel_reason_id]" class="form-control">
{foreach $options as $item} {foreach $options as $item}
@ -25,7 +25,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-12 col-sm-2">作废详情:</label> <label class="control-label col-xs-12 col-sm-2">取消详情:</label>
<div class="col-xs-12 col-sm-8"> <div class="col-xs-12 col-sm-8">
<textarea id="c-detail" data-rule="required" class="form-control" rows="5" name="row[cancel_detail]" cols="50">{$row->cancel_detail}</textarea> <textarea id="c-detail" data-rule="required" class="form-control" rows="5" name="row[cancel_detail]" cols="50">{$row->cancel_detail}</textarea>
</div> </div>

1
application/admin/view/setting/abnormal/edit.html
View File

@ -19,3 +19,4 @@
</div> </div>
</div> </div>
</form> </form>

4
public/assets/js/backend/order.js
View File

@ -390,7 +390,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
table.bootstrapTable('refresh', {}); table.bootstrapTable('refresh', {});
return false; return false;
}); });
const timer = setInterval(function () {
table.bootstrapTable('refresh', {});
},1000 * 120);
}, },
add: function () { add: function () {
$("#mybuttom").on("click", function () { $("#mybuttom").on("click", function () {