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

更新可导入商品查询

Browse Source
This commit is contained in:
yaooo 2023-09-05 10:04:30 +08:00
parent 99b2a7836b
commit 862b81267b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -903,6 +903,9 @@ class StoreOrderRepository extends BaseRepository
case 8: case 8:
$param['StoreOrder.paid'] = 1; $param['StoreOrder.paid'] = 1;
break; // 已支付 break; // 已支付
case 20:
$param['StoreOrder.status'] = 2;
break; // 已收货的商品才可以继续导入
default: default:
unset($param['StoreOrder.is_del']); unset($param['StoreOrder.is_del']);
break; // 全部 break; // 全部
@ -1709,6 +1712,7 @@ class StoreOrderRepository extends BaseRepository
{ {
$status = $where['status'] ?? ''; $status = $where['status'] ?? '';
unset($where['status']); unset($where['status']);
halt($where);
// 未支付订单 // 未支付订单
if ($status == 1) { if ($status == 1) {
$query = $this->dao->search($where)->where($this->getOrderType($status))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where('StoreOrder.is_del', 0); $query = $this->dao->search($where)->where($this->getOrderType($status))->whereRaw("(StoreOrder.paid=0 and StoreOrder.pay_type!=8) or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->where('StoreOrder.is_del', 0);