From b7bf95ee4b0b842f50fe7a5e938b9ffd3098131b Mon Sep 17 00:00:00 2001 From: weiz Date: Tue, 7 Nov 2023 17:57:22 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/LogisticsLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index bc9e3e93..00e52063 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -93,6 +93,7 @@ class LogisticsLogic extends BaseLogic $pro_item['cart_info'] = json_decode($pro_item['cart_info'], true); $pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name']; $pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name']; + $pro_item['goods_pic'] = $pro_item['cart_info']['product']['image']; $product_count += $pro_item['product_num']; unset($pro_item['cart_info']); return $pro_item; From 87cf5fc4815d8c6751b0d91e2418daaa3613c20c Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 8 Nov 2023 14:12:31 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/LogisticController.php | 103 +++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 app/common/controller/LogisticController.php diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php new file mode 100644 index 00000000..3565c060 --- /dev/null +++ b/app/common/controller/LogisticController.php @@ -0,0 +1,103 @@ +request->post(['order_sn','shop_name','user_name','courier_name','status','page_no','page_size']); + if(empty($params['page_no']) || empty($params['page_size'])){ + return $this->fail('缺少必要参数'); + } + $where = []; + foreach($params as $k => $v) { + if($k=='page_no' || $k=='page_size'){ + continue; + } + if($k != 'status'){ + $where[] = [$k,'like','%'.$v.'%']; + }else{ + $where[] = [$k,'=',$v]; + } + } + $data = Logistics::field(['id','order_id','order_sn','shop_name','shop_phone','receiver_name','receiver_phone','receiver_address','courier_name','courier_company','status','qh_time','ps_time','qx_time','create_time']) + ->where($where) + ->order(['id' => 'desc']) + ->page($params['page_no'],$params['page_size']) + ->select() + ->each(function ($item){ + $item['status_name'] = $item->status_name; + $product_count = 0; + //获取产品信息 + $item['products'] = Product::field('product_num,cart_info')->where('order_id', $item['order_id'])->select()->each(function($pro_item) use(&$product_count){ + $pro_item['cart_info'] = json_decode($pro_item['cart_info'], true); + $pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name']; + $pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name']; + $product_count += $pro_item['product_num']; + unset($pro_item['cart_info']); + return $pro_item; + }); + $item['product_count'] = $product_count; + return $item; + }) + ->toArray(); + $count = Logistics::field(['id'])->where($where)->count(); + $result = [ + 'lists'=>$data, + 'count' => $count, + 'page_no' => $params['page_no'], + 'page_size' => $params['page_size'] + ]; + return $this->success('请求成功',$result); + } + + public function detail(): \think\response\Json + { + $params = $this->request->post(['id']); + if(empty($params['id'])){ + return $this->fail('参数错误'); + } + $logistics = Logistics::findOrEmpty($params['id']); + $logistics['status_name'] = $logistics->status_name; + //获取商品信息 + $product_count = 0; + $product = Product::field('product_num,cart_info')->where('order_id', $logistics['order_id'])->select()->each(function($pro_item) use(&$product_count){ + $pro_item['cart_info'] = json_decode($pro_item['cart_info'], true); + $pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name']; + $pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name']; + $pro_item['goods_pic'] = $pro_item['cart_info']['product']['image']; + $pro_item['goods_price'] = $pro_item['cart_info']['product']['price']; + $pro_item['goods_sku'] = $pro_item['cart_info']['productAttr']['sku']; + $pro_item['goods_total_price'] = $pro_item['cart_info']['product']['price'] * $pro_item['product_num']; + $product_count += $pro_item['product_num']; + unset($pro_item['cart_info']); + return $pro_item; + })->toArray(); + $logistics['product'] = $product; + //获取物流记录 + $records = LogisticsRecord::field('type,user_name,content,create_time') + ->where('lst_id', $logistics['id'])->order('create_time asc')->select()->each(function($red_item){ + switch ($red_item['type']) { + case 1: + $red_item['content'] = '用户'.$red_item['user_name'].$red_item['content']; + break; + case 2: + $red_item['content'] = '配送员'.$red_item['user_name'].$red_item['content']; + break; + case 3: + $red_item['content'] = '平台'.$red_item['user_name'].$red_item['content']; + break; + default: + $red_item['content'] = '未知'; + } + unset($red_item['type'], $red_item['user_name']); + })->toArray(); + $logistics['records'] = $records; + //返回数据 + return $this->success('请求成功',$logistics->toArray()); + } + } \ No newline at end of file From 6084700454cdc8eda05cd208562b25704e5f1997 Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 8 Nov 2023 15:00:07 +0800 Subject: [PATCH 03/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/controller/LogisticController.php | 74 ++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php index 3565c060..0a45087d 100644 --- a/app/common/controller/LogisticController.php +++ b/app/common/controller/LogisticController.php @@ -1,6 +1,7 @@ success('请求成功',$logistics->toArray()); } + + /* + * 获取配送员物流信息列表 + * @method get + * @param int $courier_id 配送员id + * @param int $status 物流状态 + * @param int $page_size 每页数量 + * @param int $page_num 页码 + * @return \think\response\Json + */ + public function courierLogisticsList(): \think\response\Json + { + //获取参数 + $params = $this->request->post(['user_id','user_type','status','page_size','page_num','keywords']); + //验证参数 + if(empty($params['user_id'])) return $this->fail('参数错误'); + if(!isset($params['user_type'])) return $this->fail('参数错误'); + if(empty($params['keywords'])) $params['keywords'] = ''; + //返回数据 + return $this->data(LogisticsLogic::list($params)); + } + + /* + * 获取物流信息详情 + * @method get + * @param int $logistics_id 物流id + * @return \think\response\Json + */ + public function courierLogisticsDetail(): \think\response\Json + { + //获取参数 + $logistics_id = $this->request->post('logistics_id'); + //验证参数 + if(empty($logistics_id)) return $this->fail('参数错误'); + //返回数据 + return $this->data(LogisticsLogic::cDetail($logistics_id)); + } + + /* + * 配送员提取商品 + * @method post + * @param int $logistics_id 物流id + * @return \think\response\Json + */ + public function courierTakeGoods(): \think\response\Json + { + //获取参数 + $params = $this->request->post(['logistics_id','order_id','order_sn']); + //验证参数 + if(empty($params['logistics_id']) || empty($params['order_id']) || empty($params['order_sn'])) return $this->fail('参数错误'); + //提取商品 + $result = LogisticsLogic::takeGoods($params); + //返回数据 + return $result['code'] ==1 ? $this->success('提取成功') : $this->fail($result['msg']); + } + + /* + * 配送员完成配送 + * @method post + * @param int $logistics_id 物流id + * @return \think\response\Json + */ + public function courierCompleteDelivery(): \think\response\Json + { + //获取参数 + $params = $this->request->post(['logistics_id','take_code']); + //验证参数 + if(empty($params['logistics_id']) || empty($params['take_code'])) return $this->fail('参数错误'); + //完成配送 + $result = LogisticsLogic::doneDelivery($params); + //返回数据 + return $result['code'] ==1 ? $this->success('配送完成') : $this->fail($result['msg']); + } } \ No newline at end of file From 63beacc85daa17015488fe7a0a6ee5249d0a0a14 Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 11 Nov 2023 09:23:58 +0800 Subject: [PATCH 04/19] add pic --- app/api/logic/LogisticsLogic.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index 00e52063..aaaeff80 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -67,6 +67,7 @@ class LogisticsLogic extends BaseLogic $pro_item['cart_info'] = json_decode($pro_item['cart_info'], true); $pro_item['goods_name'] = $pro_item['cart_info']['product']['store_name']; $pro_item['goods_unit'] = $pro_item['cart_info']['product']['unit_name']; + $pro_item['goods_pic'] = $pro_item['cart_info']['product']['image']; $product_count += $pro_item['product_num']; unset($pro_item['cart_info']); return $pro_item; From 758163ebe2498d4369a994564c053b1205ad68de Mon Sep 17 00:00:00 2001 From: weiz Date: Sat, 11 Nov 2023 18:01:29 +0800 Subject: [PATCH 05/19] fixed --- app/api/logic/LogisticsLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index aaaeff80..089d35e4 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -86,7 +86,7 @@ class LogisticsLogic extends BaseLogic */ public static function cDetail($id):array { //获取物流信息 - $logistics = Logistics::field('id,order_id,order_sn,shop_name,shop_user,shop_phone,shop_address,shop_long,shop_lat,receiver_name,receiver_phone,receiver_address,status,create_time') + $logistics = Logistics::field('id,order_id,order_sn,shop_name,shop_user,shop_phone,shop_address,shop_long,shop_lat,receiver_name,receiver_phone,receiver_address,status,create_time,qh_time,ps_time,qx_time') ->where('id', $id)->find(); //获取商品信息 $product_count = 0; From 1f32844c5a18867e259a5ea4ac30d46a7337f719 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 13 Nov 2023 10:53:42 +0800 Subject: [PATCH 06/19] update --- app/api/controller/ContractController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/controller/ContractController.php b/app/api/controller/ContractController.php index 161bad0d..d04fa2a7 100644 --- a/app/api/controller/ContractController.php +++ b/app/api/controller/ContractController.php @@ -79,7 +79,8 @@ class ContractController extends BaseApiController 'signing_timer' => $params['signing_timer'], 'status' => $params['status'], 'contract_url' => $params['contract_url'], - 'contract_evidence' => $params['contract_evidence'] + 'contract_evidence' => $params['contract_evidence'], + 'update_time' => $params['update_time'] ]); if($contract['type'] == 0){ foreach($cars as $v){ From f6935bda30a6b75d0795e69bbd8a5a956fc2cf5c Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 13 Nov 2023 17:10:04 +0800 Subject: [PATCH 07/19] update --- app/common/controller/LogisticController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php index 0a45087d..1f05ba51 100644 --- a/app/common/controller/LogisticController.php +++ b/app/common/controller/LogisticController.php @@ -22,7 +22,11 @@ if($k != 'status'){ $where[] = [$k,'like','%'.$v.'%']; }else{ - $where[] = [$k,'=',$v]; + if($v==3){ + $where[] = [$k,'in','3,4']; + }else{ + $where[] = [$k,'=',$v]; + } } } $data = Logistics::field(['id','order_id','order_sn','shop_name','shop_phone','receiver_name','receiver_phone','receiver_address','courier_name','courier_company','status','qh_time','ps_time','qx_time','create_time']) From d56cc36cb71c42fbf25c1a06fa0ff90f1cf7307a Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 13 Nov 2023 17:12:24 +0800 Subject: [PATCH 08/19] update --- app/common/controller/LogisticController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php index 1f05ba51..0a345158 100644 --- a/app/common/controller/LogisticController.php +++ b/app/common/controller/LogisticController.php @@ -22,8 +22,8 @@ if($k != 'status'){ $where[] = [$k,'like','%'.$v.'%']; }else{ - if($v==3){ - $where[] = [$k,'in','3,4']; + if($v==2){ + $where[] = [$k,'in','2,3,4']; }else{ $where[] = [$k,'=',$v]; } From a8e58ebae454196983f8dd9e504f60eea873f55d Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 13 Nov 2023 17:23:35 +0800 Subject: [PATCH 09/19] update --- app/common/controller/LogisticController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php index 0a345158..f1f2fcf8 100644 --- a/app/common/controller/LogisticController.php +++ b/app/common/controller/LogisticController.php @@ -23,7 +23,7 @@ $where[] = [$k,'like','%'.$v.'%']; }else{ if($v==2){ - $where[] = [$k,'in','2,3,4']; + $where[] = [$k,'in','2,3']; }else{ $where[] = [$k,'=',$v]; } From f661dc0c9543ada4662d42126161ff0c31820d34 Mon Sep 17 00:00:00 2001 From: weiz Date: Tue, 14 Nov 2023 11:01:58 +0800 Subject: [PATCH 10/19] add order mark --- app/api/logic/LogisticsLogic.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index 089d35e4..0f7c56ee 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -88,6 +88,17 @@ class LogisticsLogic extends BaseLogic //获取物流信息 $logistics = Logistics::field('id,order_id,order_sn,shop_name,shop_user,shop_phone,shop_address,shop_long,shop_lat,receiver_name,receiver_phone,receiver_address,status,create_time,qh_time,ps_time,qx_time') ->where('id', $id)->find(); + //查找订单信息 + if(empty($logistics)){ + return [ + 'logistics' => [], + 'product' => [], + 'product_count' => 0, + 'record' => [], + ]; + } + $order = Order::alias('s')->where('order_id', $logistics['order_id'])->where('order_sn', $logistics['order_sn'])->find(); + $logistics['mark'] = !empty($order) ? $order['mark'] : ''; //获取商品信息 $product_count = 0; $product = Product::field('product_num,cart_info')->where('order_id', $logistics['order_id'])->select()->each(function($pro_item) use(&$product_count){ From aa8816b7df8281d9d6d02ad57c7f87aa02f98979 Mon Sep 17 00:00:00 2001 From: weiz Date: Tue, 14 Nov 2023 17:36:40 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=97=E4=B8=BB?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/LogisticsLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index 0f7c56ee..fc76b59c 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -54,7 +54,7 @@ class LogisticsLogic extends BaseLogic } $logistics = Logistics::where([$user]) ->where([$status]) - ->where('(order_sn LIKE "%'.$params['keywords'].'%" OR shop_phone LIKE "%'.$params['keywords'].'%" OR shop_name LIKE "%'.$params['keywords'].'%" OR receiver_phone LIKE "%'.$params['keywords'].'%" OR receiver_name LIKE "%'.$params['keywords'].'%")') + ->where('(order_sn LIKE "%'.$params['keywords'].'%" OR shop_phone LIKE "%'.$params['keywords'].'%" OR shop_name LIKE "%'.$params['keywords'].'%" OR shop_user LIKE "%'.$params['keywords'].'%" OR receiver_phone LIKE "%'.$params['keywords'].'%" OR receiver_name LIKE "%'.$params['keywords'].'%")') ->order('update_time desc') ->paginate([ 'list_rows'=> !empty($params['page_size'])? $params['page_size'] : 6, From e2c2a776f9945f2ad3878e4e5fd26f91a3578059 Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 20 Nov 2023 10:18:43 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/LogisticsLogic.php | 10 +++++++--- app/common.php | 19 +++++++++++++++++++ app/common/controller/LogisticController.php | 10 ++++++++++ config/app.php | 6 +++++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index fc76b59c..a5d18e1e 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -245,10 +245,14 @@ class LogisticsLogic extends BaseLogic //推送消息 $register_id = Courier::field('register_id')->where('id',$courier['user_id'])->find(); if($register_id && !empty($register_id['register_id'])){ - $push_result = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result['code'] == 0) { - Log::write('["极光推送："]'.$push_result['msg'],'error'); + $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); + $push_result2 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result1['code'] == 0) { + Log::write('["极光推送："]'.$push_result1['msg'],'error'); } + if($push_result2['code'] == 0) { + Log::write('["极光推送："]'.$push_result2['msg'],'error'); + } } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; } diff --git a/app/common.php b/app/common.php index 13522c9e..960be279 100755 --- a/app/common.php +++ b/app/common.php @@ -341,6 +341,25 @@ function push_message($reg_id,$message){ } } +function push_message2($reg_id,$message){ + //获取配置信息 + $jpush_config = config('app.jpush2'); + $app_key= $jpush_config['app_key']; //这是app密钥，填你自己的 + $master_secret= $jpush_config['master_secret']; //这也是密钥，填你自己的 + //实例化 + $client = new Client($app_key,$master_secret); + $pusher = $client->push(); + $pusher->setPlatform('all'); + $pusher->addRegistrationId($reg_id); + $pusher->setNotificationAlert($message); + try { + $res = $pusher->send(); + return ['code'=>1,'msg'=>'','data'=>$res]; + } catch (\JPush\Exceptions\JPushException $e) { + return ['code'=>0,'msg'=>$e->getMessage(),'data'=>[]]; + } +} + /** * 校验日期格式是否正确 diff --git a/app/common/controller/LogisticController.php b/app/common/controller/LogisticController.php index f1f2fcf8..3c1ade3b 100644 --- a/app/common/controller/LogisticController.php +++ b/app/common/controller/LogisticController.php @@ -5,6 +5,7 @@ use app\common\model\logistics\Logistics; use app\common\model\logistics\LogisticsRecord; use app\common\model\logistics\Product; + use think\facade\Log; class LogisticController extends BaseLikeAdminController { @@ -178,4 +179,13 @@ //返回数据 return $result['code'] ==1 ? $this->success('配送完成') : $this->fail($result['msg']); } + +// public function test() { +// $push_result = push_message2('1507bfd3f6c212e2012','您有一条新的配送任务，请尽快处理！！'); +// if($push_result['code'] == 0) { +// Log::write('["极光推送："]'.$push_result['msg'],'error'); +// }else{ +// return $this->success('ok',$push_result); +// } +// } } \ No newline at end of file diff --git a/config/app.php b/config/app.php index c84880da..2dbd70d6 100755 --- a/config/app.php +++ b/config/app.php @@ -29,9 +29,13 @@ return [ 'error_message' => '页面错误！请稍后再试～', // 显示错误信息 'show_error_msg' => false, - // 机关推送 + // 极光推送 'jpush' => [ 'app_key' => '5ced5ec5fa7bb86302944f0f', 'master_secret' => 'd85135e7d8470c90b476e535', ], + 'jpush2' => [ + 'app_key' => 'ef20394fbd9b59ead68f53b3', + 'master_secret' => 'cb588b0d210df80b3659c543', + ], ]; From 8921d0c70e527db66ce10864714b759feeab258c Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 22 Nov 2023 11:08:47 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=B6=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/LogisticsLogic.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index a5d18e1e..e376cd4d 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -243,17 +243,19 @@ class LogisticsLogic extends BaseLogic return ['code'=>0, 'msg'=>$e->getMessage()]; } //推送消息 - $register_id = Courier::field('register_id')->where('id',$courier['user_id'])->find(); - if($register_id && !empty($register_id['register_id'])){ - $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); - $push_result2 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result1['code'] == 0) { - Log::write('["极光推送："]'.$push_result1['msg'],'error'); - } - if($push_result2['code'] == 0) { - Log::write('["极光推送："]'.$push_result2['msg'],'error'); - } - } + $register_id = Courier::field('register_id,ytj_register_id')->where('id',$courier['user_id'])->findOrEmpty(); + if(!$register_id->isEmpty() && !empty($register_id['register_id'])){ + $push_result = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result['code'] == 0) { + Log::write('["极光推送："]'.$push_result['msg'],'error'); + } + } + if(!$register_id->isEmpty() && !empty($register_id['ytj_register_id'])){ + $push_result = push_message($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result['code'] == 0) { + Log::write('["极光推送："]'.$push_result['msg'],'error'); + } + } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; } From de88dbd9db9aee5c2be8fa92fc58a56b747914fb Mon Sep 17 00:00:00 2001 From: weiz Date: Wed, 22 Nov 2023 11:18:07 +0800 Subject: [PATCH 14/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=B6=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/LogisticsLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index e376cd4d..d7ebfe63 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -251,7 +251,7 @@ class LogisticsLogic extends BaseLogic } } if(!$register_id->isEmpty() && !empty($register_id['ytj_register_id'])){ - $push_result = push_message($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); + $push_result = push_message2($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); if($push_result['code'] == 0) { Log::write('["极光推送："]'.$push_result['msg'],'error'); } From 0c61ec1ce3de77f4e4451e037143848422a6fecd Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 24 Nov 2023 15:34:32 +0800 Subject: [PATCH 15/19] update --- app/api/logic/LogisticsLogic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index d7ebfe63..8bb34ff3 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -247,13 +247,13 @@ class LogisticsLogic extends BaseLogic if(!$register_id->isEmpty() && !empty($register_id['register_id'])){ $push_result = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); if($push_result['code'] == 0) { - Log::write('["极光推送："]'.$push_result['msg'],'error'); + Log::write('["极光推送1："]'.$push_result['msg'],'error'); } } if(!$register_id->isEmpty() && !empty($register_id['ytj_register_id'])){ $push_result = push_message2($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); if($push_result['code'] == 0) { - Log::write('["极光推送："]'.$push_result['msg'],'error'); + Log::write('["极光推送2："]'.$push_result['msg'],'error'); } } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; From 64d7b9abdc4589dd026bae4911cb169e0d5197ee Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 24 Nov 2023 15:48:41 +0800 Subject: [PATCH 16/19] update --- app/api/logic/LogisticsLogic.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index 8bb34ff3..f6e36191 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -189,7 +189,7 @@ class LogisticsLogic extends BaseLogic $captain = Courier::field('id,company_id,nickname,mobile')->where("CONCAT_WS(',',province,city,area,street,village,brigade) = '". $order['user_address_code']."'")->where('is_captain',1)->find(); if(!$captain) return ['code'=>0, 'msg'=>'无法确定所在小队']; //获取配送员信息 - $courier = Company::field('company_name,user_id,master_name,master_phone')->where('id',$captain['company_id'])->find(); + $courier = Company::field('company_name,user_id,master_name,master_phone,register_id,ytj_register_id')->where('id',$captain['company_id'])->find(); //判断配送员是否存在 if(!$courier) return ['code'=>0, 'msg'=>'配送员未匹配']; //获取下单用户信息 @@ -243,17 +243,16 @@ class LogisticsLogic extends BaseLogic return ['code'=>0, 'msg'=>$e->getMessage()]; } //推送消息 - $register_id = Courier::field('register_id,ytj_register_id')->where('id',$courier['user_id'])->findOrEmpty(); - if(!$register_id->isEmpty() && !empty($register_id['register_id'])){ - $push_result = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result['code'] == 0) { - Log::write('["极光推送1："]'.$push_result['msg'],'error'); + if(!empty($courier['register_id'])){ + $push_result1 = push_message($courier['register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result1['code'] == 0) { + Log::write('["极光推送_mobile："]'.$push_result1['msg'],'error'); } } - if(!$register_id->isEmpty() && !empty($register_id['ytj_register_id'])){ - $push_result = push_message2($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result['code'] == 0) { - Log::write('["极光推送2："]'.$push_result['msg'],'error'); + if(!empty($courier['ytj_register_id'])){ + $push_result2 = push_message2($courier['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result2['code'] == 0) { + Log::write('["极光推送_pad："]'.$push_result2['msg'],'error'); } } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; From 62b82bad11901aa2147c0544045f990627a4cbfd Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 24 Nov 2023 15:53:45 +0800 Subject: [PATCH 17/19] update --- app/api/logic/LogisticsLogic.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index f6e36191..b7fe66f1 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -189,7 +189,7 @@ class LogisticsLogic extends BaseLogic $captain = Courier::field('id,company_id,nickname,mobile')->where("CONCAT_WS(',',province,city,area,street,village,brigade) = '". $order['user_address_code']."'")->where('is_captain',1)->find(); if(!$captain) return ['code'=>0, 'msg'=>'无法确定所在小队']; //获取配送员信息 - $courier = Company::field('company_name,user_id,master_name,master_phone,register_id,ytj_register_id')->where('id',$captain['company_id'])->find(); + $courier = Company::field('company_name,user_id,master_name,master_phone')->where('id',$captain['company_id'])->find(); //判断配送员是否存在 if(!$courier) return ['code'=>0, 'msg'=>'配送员未匹配']; //获取下单用户信息 @@ -243,18 +243,21 @@ class LogisticsLogic extends BaseLogic return ['code'=>0, 'msg'=>$e->getMessage()]; } //推送消息 - if(!empty($courier['register_id'])){ - $push_result1 = push_message($courier['register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result1['code'] == 0) { - Log::write('["极光推送_mobile："]'.$push_result1['msg'],'error'); + $register_id = Courier::field('register_id,ytj_register_id')->where('id',$courier['user_id'])->findOrEmpty(); + if(!$register_id->isEmpty()){ + if(!empty($register_id['register_id'])){ + $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result1['code'] == 0) { + Log::write('["极光推送1："]'.$push_result1['msg'],'error'); + } + } + if(!empty($register_id['ytj_register_id'])){ + $push_result2 = push_message2($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result2['code'] == 0) { + Log::write('["极光推送2："]'.$push_result2['msg'],'error'); + } } } - if(!empty($courier['ytj_register_id'])){ - $push_result2 = push_message2($courier['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result2['code'] == 0) { - Log::write('["极光推送_pad："]'.$push_result2['msg'],'error'); - } - } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; } From 2b4582dacd7f6930441ded48150684cae00f4312 Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 24 Nov 2023 15:56:01 +0800 Subject: [PATCH 18/19] update --- app/api/logic/LogisticsLogic.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php index b7fe66f1..9df456ab 100644 --- a/app/api/logic/LogisticsLogic.php +++ b/app/api/logic/LogisticsLogic.php @@ -245,18 +245,18 @@ class LogisticsLogic extends BaseLogic //推送消息 $register_id = Courier::field('register_id,ytj_register_id')->where('id',$courier['user_id'])->findOrEmpty(); if(!$register_id->isEmpty()){ - if(!empty($register_id['register_id'])){ - $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); - if($push_result1['code'] == 0) { - Log::write('["极光推送1："]'.$push_result1['msg'],'error'); - } - } if(!empty($register_id['ytj_register_id'])){ $push_result2 = push_message2($register_id['ytj_register_id'],'您有一条新的配送任务，请尽快处理！！'); if($push_result2['code'] == 0) { Log::write('["极光推送2："]'.$push_result2['msg'],'error'); } } + if(!empty($register_id['register_id'])){ + $push_result1 = push_message($register_id['register_id'],'您有一条新的配送任务，请尽快处理！！'); + if($push_result1['code'] == 0) { + Log::write('["极光推送1："]'.$push_result1['msg'],'error'); + } + } } return ['code'=>1, 'msg'=>'操作成功','data'=>['nickname'=>$courier['master_name'],'phone'=>$courier['master_phone']]]; } From 27661867efd226e258bbe62359e3369ded72e14e Mon Sep 17 00:00:00 2001 From: weiz Date: Fri, 1 Dec 2023 18:07:19 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=91=98=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/LogisticsController.php | 38 +++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php index 33e1f06e..131bee4f 100755 --- a/app/api/controller/LogisticsController.php +++ b/app/api/controller/LogisticsController.php @@ -15,6 +15,8 @@ namespace app\api\controller; use app\api\logic\LogisticsLogic; +use app\common\model\logistics\Logistics; +use think\response\Json; /** * 物流管理 @@ -35,7 +37,7 @@ class LogisticsController extends BaseApiController * @param int $page_num 页码 * @return \think\response\Json */ - public function courierLogisticsList(): \think\response\Json + public function courierLogisticsList(): Json { //获取参数 $params = $this->request->get(['user_id','user_type','status','page_size','page_num','keywords']); @@ -54,7 +56,7 @@ class LogisticsController extends BaseApiController * @param int $logistics_id 物流id * @return \think\response\Json */ - public function courierLogisticsDetail(): \think\response\Json + public function courierLogisticsDetail(): Json { //获取参数 $logistics_id = $this->request->get('logistics_id'); @@ -71,7 +73,7 @@ class LogisticsController extends BaseApiController * @param string $order_sn 订单编号 * @return \think\response\Json */ - public function logisticsCreate(): \think\response\Json + public function logisticsCreate(): Json { //获取参数 $params = $this->request->post(['order_id','order_sn']); @@ -89,7 +91,7 @@ class LogisticsController extends BaseApiController * @param int $logistics_id 物流id * @return \think\response\Json */ - public function courierTakeGoods(): \think\response\Json + public function courierTakeGoods(): Json { //获取参数 $params = $this->request->post(['logistics_id','order_id','order_sn']); @@ -107,7 +109,7 @@ class LogisticsController extends BaseApiController * @param int $logistics_id 物流id * @return \think\response\Json */ - public function courierCompleteDelivery(): \think\response\Json + public function courierCompleteDelivery(): Json { //获取参数 $params = $this->request->post(['logistics_id','take_code']); @@ -125,7 +127,7 @@ class LogisticsController extends BaseApiController * @param int $logistics_id 物流id * @return \think\response\Json */ - public function userCancelOrder(): \think\response\Json + public function userCancelOrder(): Json { //获取参数 $params = $this->request->post(['order_id','order_sn']); @@ -143,7 +145,7 @@ class LogisticsController extends BaseApiController * @param int $logistics_id 物流id * @return \think\response\Json */ - public function userLogisticsDetail(): \think\response\Json + public function userLogisticsDetail(): Json { //获取参数 $params = $this->request->get(['order_id','order_sn']); @@ -154,7 +156,7 @@ class LogisticsController extends BaseApiController } //获取配送员 - public function hasCourier(): \think\response\Json { + public function hasCourier(): Json { //获取参数 $param = $this->request->get('user_address_code'); if(empty($param)) { @@ -168,5 +170,25 @@ class LogisticsController extends BaseApiController return $this->fail('无配送员'); } } + + //获取配送员信息 + public function courierData(): Json + { + $params = $this->request->get(['order_sn']); + if(empty($params['order_sn'])){ + return $this->fail('参数错误'); + } + $data = Logistics::where('order_sn',$params['order_sn'])->findOrEmpty(); + if($data->isEmpty()){ + return $this->fail('订单信息错误'); + } + $result = [ + 'courier_id' => $data['courier_id'], + 'courier_name' => $data['courier_name'], + 'courier_phone' => $data['courier_phone'], + 'courier_company' => $data['courier_company'], + ]; + return $this->success('请求成功',$result); + } } \ No newline at end of file