github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-31 15:00:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化获取附件分类列表

Browse Source 
优化商家寄件逻辑
This commit is contained in:
evoxwht 2023-06-28 12:13:56 +08:00
parent ddce35e733
commit 2764ead2da
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crmeb/app/services/order/StoreOrderServices.php
View File

@ -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)

6
crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php
View File

@ -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');