This commit is contained in:
weiz 2023-11-24 15:53:45 +08:00
parent 64d7b9abdc
commit 62b82bad11

View File

@ -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']]];
}