diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php index 0067225c..aa0fdd6a 100644 --- a/app/common/dao/store/order/StoreGroupOrderDao.php +++ b/app/common/dao/store/order/StoreGroupOrderDao.php @@ -15,6 +15,7 @@ namespace app\common\dao\store\order; use app\common\dao\BaseDao; +use app\common\Enum; use app\common\model\store\order\StoreGroupOrder; /** @@ -86,7 +87,7 @@ class StoreGroupOrderDao extends BaseDao */ 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) { $query->where('is_remind', 0); })->where('create_time', '<=', $time)->column('group_order_id'); diff --git a/app/common/dao/store/order/StoreOrderStatusDao.php b/app/common/dao/store/order/StoreOrderStatusDao.php index 61463989..77ba53b1 100644 --- a/app/common/dao/store/order/StoreOrderStatusDao.php +++ b/app/common/dao/store/order/StoreOrderStatusDao.php @@ -15,6 +15,7 @@ namespace app\common\dao\store\order; use app\common\dao\BaseDao; +use app\common\Enum; use app\common\model\BaseModel; use app\common\model\store\order\StoreOrderStatus; 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') ->whereIn('A.change_type', [StoreOrderStatusRepository::ORDER_DELIVERY_SELF, StoreOrderStatusRepository::ORDER_DELIVERY_NOTHING,StoreOrderStatusRepository::ORDER_DELIVERY_COURIER]) ->where('A.type','order') + ->where('B.pay_type','<>',Enum::public) ->whereBetweenTime('A.change_time',$start,$end) ->where('B.paid', 1)->where('B.status', 1) ->column('A.order_id');