Merge branch 'dev'

This commit is contained in:
wucongxing8150 2024-05-11 14:54:35 +08:00
commit 2c21fbc6f1

View File

@ -137,15 +137,15 @@ class getPrescriptionOrderStatusCommand extends HyperfCommand
} }
// 检测物流编号是否已经存在并订阅 // 检测物流编号是否已经存在并订阅
if (empty($item['logistics_no']) || $item['logistics_no'] != $result['deliveryId']){ if (empty($order_product['logistics_no']) || $order_product['logistics_no'] != $result['deliveryId']){
$this->line("开始订阅快递推送"); $this->line("开始订阅快递推送");
// 订阅快递推送 // 订阅快递推送
$Kuaidi = new Kuaidi(); $Kuaidi = new Kuaidi();
$Kuaidi->subscribe($result['deliveryId'],$logistics_company_code,$item['consignee_tel']); $Kuaidi->subscribe($result['deliveryId'],$logistics_company_code,$order_product['consignee_tel']);
// 修改成功时药品订单数据 // 修改成功时药品订单数据
$this->savePreSuccessOrderStatus($item,$result['deliveryId'],$logistics_company_code,$result['deliveryTime']); $this->savePreSuccessOrderStatus($order_product,$result['deliveryId'],$logistics_company_code,$result['deliveryTime']);
try { try {
// 获取患者数据 // 获取患者数据
@ -158,7 +158,7 @@ class getPrescriptionOrderStatusCommand extends HyperfCommand
// 患者-药品已发货-订阅失败发送短信 // 患者-药品已发货-订阅失败发送短信
$MessagePush = new MessagePush($user_patient['user_id']); $MessagePush = new MessagePush($user_patient['user_id']);
$MessagePush->productDelivery($item['order_product_id']); $MessagePush->productDelivery($order_product['order_product_id']);
$this->line("推送消息成功"); $this->line("推送消息成功");
}catch (\Exception $e){ }catch (\Exception $e){