diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index b50170b72..936b54509 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -2689,7 +2689,7 @@ HTML; } //发起取消商家寄件 - $res = app()->make(ServeServices::class)->express()->shipmentCancelOrder([ + app()->make(ServeServices::class)->express()->shipmentCancelOrder([ 'task_id' => $orderInfo->kuaidi_task_id, 'order_id' => $orderInfo->kuaidi_order_id, 'cancel_msg' => $msg, @@ -2717,7 +2717,7 @@ HTML; $orderInfo->save(); }); - return $res; + return true; } public function checkSubOrderNotSend(int $pid, int $order_id) diff --git a/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php b/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php index a1ece2c55..d46b05aad 100644 --- a/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php +++ b/crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php @@ -54,8 +54,10 @@ class SystemAttachmentCategoryServices extends BaseServices } else { foreach ($list as &$item) { $item['title'] = $item['name']; - $item['children'] = []; - if ($where['name'] == '' && $this->dao->count(['pid' => $item['id']])) $item['loading'] = false; + if ($where['name'] == '' && $this->dao->count(['pid' => $item['id']])) { + $item['loading'] = false; + $item['children'] = []; + } } } return compact('list');