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

修改待付款订单列表

Browse Source
This commit is contained in:
luofei 2023-07-08 10:18:55 +08:00
parent 1e4be9da6f
commit c51850a61d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/common/dao/store/order/StoreGroupOrderDao.php
View File

@ -16,6 +16,7 @@ namespace app\common\dao\store\order;
use app\common\dao\BaseDao; use app\common\dao\BaseDao;
use app\common\model\store\order\StoreGroupOrder; use app\common\model\store\order\StoreGroupOrder;
use app\common\model\store\order\StoreOrder;
/** /**
* Class StoreGroupOrderDao * Class StoreGroupOrderDao
@ -57,14 +58,16 @@ class StoreGroupOrderDao extends BaseDao
*/ */
public function search(array $where) public function search(array $where)
{ {
return StoreGroupOrder::getDB()->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) { $storeOrderWhere = StoreOrder::where('activity_type', $where['product_type']);
$query->where('paid', $where['paid']); return StoreGroupOrder::hasWhere('orderList', $storeOrderWhere)
->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
$query->where('StoreGroupOrder.paid', $where['paid']);
})->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) { })->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
$query->where('uid', $where['uid']); $query->where('StoreGroupOrder.uid', $where['uid']);
})->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) { })->order('create_time DESC')->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
$query->where('is_del', $where['is_del']); $query->where('StoreGroupOrder.is_del', $where['is_del']);
}, function ($query) { }, function ($query) {
$query->where('is_del', 0); $query->where('StoreGroupOrder.is_del', 0);
}); });
} }

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

@ -63,7 +63,7 @@ class StoreGroupOrderRepository extends BaseRepository
$query = $this->search($where); $query = $this->search($where);
$count = $query->count(); $count = $query->count();
$list = $query->with(['orderList' => function (Relation $query) { $list = $query->with(['orderList' => function (Relation $query) {
$query->field('order_id,group_order_id,activity_type,pay_price')->with(['orderProduct','presellOrder']); $query->field('order_id,group_order_id,activity_type,pay_price,status')->with(['orderProduct','presellOrder']);
}])->page($page, $limit)->order('create_time DESC')->select(); }])->page($page, $limit)->order('create_time DESC')->select();
return compact('count', 'list'); return compact('count', 'list');
} }

3
app/controller/api/store/order/StoreOrder.php
View File

@ -179,7 +179,8 @@ class StoreOrder extends BaseController
public function groupOrderList(StoreGroupOrderRepository $groupOrderRepository) public function groupOrderList(StoreGroupOrderRepository $groupOrderRepository)
{ {
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0], $page, $limit); $productType = $this->request->param('product_type', 0);
$list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0, 'product_type' => $productType], $page, $limit);
return app('json')->success($list); return app('json')->success($list);
} }