diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index 25835f3c5..4c049aae3 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -458,7 +458,7 @@ class StoreOrder extends AuthController */ public function order_info($id) { - if (!$id || !($orderInfo = $this->services->get($id))) { + if (!$id || !($orderInfo = $this->services->get($id, [], ['refund']))) { return app('json')->fail(400118); } /** @var UserServices $services */ @@ -497,6 +497,13 @@ class StoreOrder extends AuthController } else $orderInfo['_store_name'] = ''; $orderInfo['spread_name'] = $services->value(['uid' => $orderInfo['spread_uid']], 'nickname') ?? '无'; + $orderInfo['_info'] = app()->make(StoreOrderCartInfoServices::class)->getOrderCartInfo((int)$orderInfo['id']); + $cart_num = 0; + $refund_num = array_sum(array_column($orderInfo['refund'], 'refund_num')); + foreach ($orderInfo['_info'] as $items) { + $cart_num += $items['cart_info']['cart_num']; + } + $orderInfo['is_all_refund'] = $refund_num == $cart_num; $userInfo = $userInfo->toArray(); return app('json')->success(compact('orderInfo', 'userInfo')); } diff --git a/template/admin/src/pages/order/orderList/handle/orderDetails.vue b/template/admin/src/pages/order/orderList/handle/orderDetails.vue index 1af441237..138e63abd 100644 --- a/template/admin/src/pages/order/orderList/handle/orderDetails.vue +++ b/template/admin/src/pages/order/orderList/handle/orderDetails.vue @@ -15,7 +15,16 @@