Browse Source

优化获取附件分类列表
优化商家寄件逻辑

evoxwht 2 năm trước cách đây
mục cha
commit
2764ead2da

+ 2 - 2
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,
             'task_id' => $orderInfo->kuaidi_task_id,
             'order_id' => $orderInfo->kuaidi_order_id,
             'order_id' => $orderInfo->kuaidi_order_id,
             'cancel_msg' => $msg,
             'cancel_msg' => $msg,
@@ -2717,7 +2717,7 @@ HTML;
             $orderInfo->save();
             $orderInfo->save();
         });
         });
 
 
-        return $res;
+        return true;
     }
     }
 
 
     public function checkSubOrderNotSend(int $pid, int $order_id)
     public function checkSubOrderNotSend(int $pid, int $order_id)

+ 4 - 2
crmeb/app/services/system/attachment/SystemAttachmentCategoryServices.php

@@ -54,8 +54,10 @@ class SystemAttachmentCategoryServices extends BaseServices
         } else {
         } else {
             foreach ($list as &$item) {
             foreach ($list as &$item) {
                 $item['title'] = $item['name'];
                 $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');
         return compact('list');