github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 22:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改订单详情的订单状态与列表的订单状态展示不一致

Browse Source
This commit is contained in:
evoxwht 2023-03-23 12:05:16 +08:00
parent 7223604699
commit 972f2a317f
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crmeb/app/adminapi/controller/v1/order/StoreOrder.php
View File

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

11
template/admin/src/pages/order/orderList/handle/orderDetails.vue
View File

@ -15,7 +15,16 @@
<div class="ivu-description-list-title">订单信息</div>
<Row class="mb10">
<Col span="12">订单ID：{{ orderDatalist.orderInfo.order_id }}</Col>
<Col span="12" class="fontColor1">订单状态：{{ orderDatalist.orderInfo._status._title }}</Col>
<Col span="12" class="fontColor1"
>订单状态：{{ orderDatalist.orderInfo._status._title }}
{{
orderDatalist.orderInfo.refund.length
? orderDatalist.orderInfo.is_all_refund
? '退款中'
: '部分退款中'
: ''
}}
</Col>
</Row>
<Row class="mb10">
<Col span="12">商品总数：{{ orderDatalist.orderInfo.total_num }}</Col>