From 9796c6ba53f93035534d16b66a18f33d8dc79470 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Wed, 16 Apr 2025 09:28:07 +0800 Subject: [PATCH 1/2] sth --- public/assets/js/backend/orders/dispatchlog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/js/backend/orders/dispatchlog.js b/public/assets/js/backend/orders/dispatchlog.js index a3b29c3..1bfb87e 100644 --- a/public/assets/js/backend/orders/dispatchlog.js +++ b/public/assets/js/backend/orders/dispatchlog.js @@ -118,7 +118,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'remark', title: __('跟进内容'), operate: 'LIKE', table: table2, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'need_notice', title: __('需要提醒'), searchList: {"0":__('否'),"1":__('是')}, formatter: Table.api.formatter.normal}, {field: 'notice_time', title: __('提醒时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, - {field: 'status', title: __('状态'), searchList: {"0":__('未完成'),"1":__('已结束')}, formatter: Table.api.formatter.status}, + {field: 'status', title: __('状态'), searchList: {"0":__('进行中'),"1":__('已完成')}, formatter: Table.api.formatter.status}, {field: 'create_time', title: __('创建时间'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, //{field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false}, ] From 5bce8cf36c0f593fc389699f3d5dfcdbd2998fe2 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Wed, 16 Apr 2025 10:27:30 +0800 Subject: [PATCH 2/2] sth --- application/admin/controller/orders/Dispatch2.php | 2 +- application/admin/controller/orders/Dispatchrecord.php | 6 +++--- application/common/Logic/OrderLogic.php | 3 +++ application/common/command/CheckOrdeRecordCommand.php | 4 ++++ public/assets/js/backend/orders/dispatch2.js | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php index f61f883..d7a062c 100644 --- a/application/admin/controller/orders/Dispatch2.php +++ b/application/admin/controller/orders/Dispatch2.php @@ -243,8 +243,8 @@ class Dispatch2 extends Backend $params['status'] = OrderDispatch::STATUS_FINISH; $params['finish_time'] = date('Y-m-d H:i:s'); + $params['follow'] = 2; $result = $row->allowField(true)->save($params); - //修改订单状态 $OrderLogic = new OrderLogic(); $OrderLogic -> dispachFinishAfter($row,['role'=>1,'auth'=>$this->auth,'remark'=>'后台操作完成任务，操作人:'.$this->auth->nickname]); diff --git a/application/admin/controller/orders/Dispatchrecord.php b/application/admin/controller/orders/Dispatchrecord.php index 160d998..353e491 100644 --- a/application/admin/controller/orders/Dispatchrecord.php +++ b/application/admin/controller/orders/Dispatchrecord.php @@ -55,11 +55,11 @@ class Dispatchrecord extends Backend if(empty($dispatch)){ $this->error('没有关联派单'); } - $list = $this->model->where('dispatch_id',$ids)->order('id','desc')->select(); + // $list = $this->model->where('dispatch_id',$ids)->order('id','desc')->select(); $this->assign('dispatch',$dispatch); - $this->assign('records',$list); + // $this->assign('records',$list); return $this->view->fetch(); } @@ -83,8 +83,8 @@ class Dispatchrecord extends Backend } $params['admin_id'] = $this->auth->id; - $result = $this->model->allowField(true)->save($params); + OrderDispatch::where('id',$params['dispatch_id'])->where('follow',0)->update(['follow'=>1]); Db::commit(); } catch (ValidateException|PDOException|Exception $e) { Db::rollback(); diff --git a/application/common/Logic/OrderLogic.php b/application/common/Logic/OrderLogic.php index d12a23e..8a8c6b1 100644 --- a/application/common/Logic/OrderLogic.php +++ b/application/common/Logic/OrderLogic.php @@ -46,6 +46,9 @@ class OrderLogic $orderUpdate = [ 'status' => Order::STATUS_CHECKING ]; + $orderDispatch->follow = 2; + $orderDispatch->save(); + if($orderDispatch->is_receipt == 1){ //要收款，计算确认尾款 $offline_amount = $orderDispatch->total; $total = bcadd($order->online_amount,$offline_amount,2); diff --git a/application/common/command/CheckOrdeRecordCommand.php b/application/common/command/CheckOrdeRecordCommand.php index c41fec6..13d83b1 100644 --- a/application/common/command/CheckOrdeRecordCommand.php +++ b/application/common/command/CheckOrdeRecordCommand.php @@ -2,6 +2,7 @@ namespace app\common\command; +use app\admin\model\OrderDispatch; use app\admin\model\OrderDispatchRecord; use think\console\Command; @@ -26,12 +27,15 @@ class CheckOrdeRecordCommand extends Command ->where('status',0) ->chunk(100, function ($list) { $ids = []; + $dispatchIds = []; foreach ($list as $item) { //todo...通知逻辑 $ids[] = $item->id; + $dispatchIds = $item->dispatch_id; //修改状态 } OrderDispatchRecord::whereIn('id',$ids)->update(['status'=>1]); + OrderDispatch::where('id',$dispatchIds)->where('follow',1)->update(['follow'=>0]); }); } diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index 968e1fc..7ca7566 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -65,6 +65,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, } }}, + {field: 'follow', title: __('跟进状态'), searchList: {"0":__('待跟进'),"1":__('已跟进'),"2":__('已结束')}, formatter: Table.api.formatter.normal}, {field: 'order.source_shop', title: __('Order.source_shop'), operate: 'LIKE'}, // {field: 'order.source', title: __('Order.source')},