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

修改监听事件

Browse Source
This commit is contained in:
liu 2024-03-16 14:55:32 +08:00
parent 24a9ae3d76
commit 718505a62b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ namespace app\common\dao\store\order;
use app\common\dao\BaseDao; use app\common\dao\BaseDao;
use app\common\Enum;
use app\common\model\store\order\StoreGroupOrder; use app\common\model\store\order\StoreGroupOrder;
/** /**
@ -86,7 +87,7 @@ class StoreGroupOrderDao extends BaseDao
*/ */
public function getTimeOutIds($time, $is_remind = false) public function getTimeOutIds($time, $is_remind = false)
{ {
return StoreGroupOrder::getDB()->where('is_del', 0)->where('pay_type','<>',10)->where('paid', 0) return StoreGroupOrder::getDB()->where('is_del', 0)->where('pay_type','<>',Enum::public)->where('paid', 0)
->when($is_remind, function ($query) { ->when($is_remind, function ($query) {
$query->where('is_remind', 0); $query->where('is_remind', 0);
})->where('create_time', '<=', $time)->column('group_order_id'); })->where('create_time', '<=', $time)->column('group_order_id');

2
app/common/dao/store/order/StoreOrderStatusDao.php
View File

@ -15,6 +15,7 @@ namespace app\common\dao\store\order;
use app\common\dao\BaseDao; use app\common\dao\BaseDao;
use app\common\Enum;
use app\common\model\BaseModel; use app\common\model\BaseModel;
use app\common\model\store\order\StoreOrderStatus; use app\common\model\store\order\StoreOrderStatus;
use app\common\repositories\store\order\StoreOrderStatusRepository; use app\common\repositories\store\order\StoreOrderStatusRepository;
@ -67,6 +68,7 @@ class StoreOrderStatusDao extends BaseDao
return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id') return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
->whereIn('A.change_type', [StoreOrderStatusRepository::ORDER_DELIVERY_SELF, StoreOrderStatusRepository::ORDER_DELIVERY_NOTHING,StoreOrderStatusRepository::ORDER_DELIVERY_COURIER]) ->whereIn('A.change_type', [StoreOrderStatusRepository::ORDER_DELIVERY_SELF, StoreOrderStatusRepository::ORDER_DELIVERY_NOTHING,StoreOrderStatusRepository::ORDER_DELIVERY_COURIER])
->where('A.type','order') ->where('A.type','order')
->where('B.pay_type','<>',Enum::public)
->whereBetweenTime('A.change_time',$start,$end) ->whereBetweenTime('A.change_time',$start,$end)
->where('B.paid', 1)->where('B.status', 1) ->where('B.paid', 1)->where('B.status', 1)
->column('A.order_id'); ->column('A.order_id');