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

订单属地

Browse Source
This commit is contained in:
chan 2023-12-11 17:31:47 +08:00
parent ac4023b113
commit 0176cf3bd5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreRefundOrderRepository.php
View File

@ -583,7 +583,7 @@ class StoreRefundOrderRepository extends BaseRepository
public function getAllList(array $where, int $page, int $limit) public function getAllList(array $where, int $page, int $limit)
{ {
$query = $this->dao->search($where)->with(['order' => function ($query) { $query = $this->dao->search($where)->with(['order' => function ($query) {
$query->field('order_id,order_sn,activity_type'); $query->field('order_id,order_sn,activity_type,user_address_code');
}, 'merchant' => function ($query) { }, 'merchant' => function ($query) {
$query->field('mer_id,mer_name,is_trader'); $query->field('mer_id,mer_name,is_trader');
}, 'refundProduct.product', 'user' => function ($query) { }, 'refundProduct.product', 'user' => function ($query) {

10
app/controller/api/dataview/Order.php
View File

@ -563,7 +563,15 @@ class Order extends BaseController
{ {
[$page,$limit] = $this->getPage(); [$page,$limit] = $this->getPage();
$where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']); $where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
return app('json')->success($repository->getAllList($where, $page, $limit)); $list = $repository->getAllList($where, $page, $limit)
foreach($list as &$item) {
$userAddressCode = explode(',', $item['order']['user_address_code']);
$area = Db::name('geo_area')->where('area_code', $userAddressCode[0])->value('area_name');
$street = Db::name('geo_street')->where('street_code', $userAddressCode[0])->value('street_name');
$item['order']['order_from'] = $area.$street;
}
unset($item);
return app('json')->success($list);
} }
// 核销订单 // 核销订单