mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat(store_order): 优化订单列表和退款订单列表' (#357) from dev into main

Browse Source 
Reviewed-on: #357
This commit is contained in:
mkm 2024-11-23 15:02:58 +08:00
commit 5729948282
2 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/admin/lists/store_order/StoreOrderLists.php
View File

@ -97,6 +97,28 @@ class StoreOrderLists extends BaseAdminDataLists implements ListsSearchInterface
$items['image'] = $items['cart_info']['image'] ?? ''; $items['image'] = $items['cart_info']['image'] ?? '';
} }
$item['product'] = $product; $item['product'] = $product;
$pay_type_name = '';
switch ($item['pay_type']) {
case 3:
$pay_type_name = '余额支付';
break;
case 7:
$pay_type_name = '微信支付';
break;
case 9:
$pay_type_name = '微信条码';
break;
case 13:
$pay_type_name = '支付宝条码';
break;
case 17:
$pay_type_name = '现金支付';
break;
case 18:
$pay_type_name = '采购款支付';
break;
}
$item['pay_type_name'] = $pay_type_name;
return $item; return $item;
}) })
->toArray(); ->toArray();

8
app/admin/lists/store_order/StoreRefundOrderLists.php
View File

@ -6,6 +6,7 @@ use app\admin\lists\BaseAdminDataLists;
use app\common\enum\OrderEnum; use app\common\enum\OrderEnum;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\store_order\StoreOrder; use app\common\model\store_order\StoreOrder;
use app\common\model\store_order_cart_info\StoreOrderCartInfo;
use app\common\model\user\User; use app\common\model\user\User;
class StoreRefundOrderLists extends BaseAdminDataLists implements ListsSearchInterface class StoreRefundOrderLists extends BaseAdminDataLists implements ListsSearchInterface
@ -56,6 +57,13 @@ class StoreRefundOrderLists extends BaseAdminDataLists implements ListsSearchInt
$item['nickname'] = $user['real_name'] != '' ? $user['real_name'] . '|' . $id : $user['nickname'] . '|' . $id; $item['nickname'] = $user['real_name'] != '' ? $user['real_name'] . '|' . $id : $user['nickname'] . '|' . $id;
} }
} }
$product = StoreOrderCartInfo::where('oid', $item['id'])->field(['id', 'oid', 'product_id', 'cart_info'])
->limit(3)->select();
foreach ($product as &$items) {
$items['store_name'] = $items['cart_info']['name'] ?? '';
$items['image'] = $items['cart_info']['image'] ?? '';
}
$item['product'] = $product;
$item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : ''; $item['pay_time'] = $item['pay_time'] > 0 ? date('Y-m-d H:i:s', $item['pay_time']) : '';
$item['refund_status_name'] = OrderEnum::refundStatus($item['refund_status']) ?? ''; $item['refund_status_name'] = OrderEnum::refundStatus($item['refund_status']) ?? '';
$item['refund_type_name'] = OrderEnum::refundType($item['refund_type']) ?? ''; $item['refund_type_name'] = OrderEnum::refundType($item['refund_type']) ?? '';