Merge branch 'feature/purchase_record' into dev

This commit is contained in:
luofei 2023-07-18 14:49:44 +08:00
commit 7d48f24a24

View File

@ -2584,7 +2584,6 @@ class StoreOrderRepository extends BaseRepository
$orders = StoreOrder::where($where)
->where('activity_type', 98)
->whereIn('status', [StoreOrder::STATUS_WAIT_COMMENT, StoreOrder::STATUS_FINISH])
->where('is_del', 0)
->where('is_system_del', 0)
->when($keyword !== '', function ($query) use ($keyword) {
$query->where('order_sn|user_phone', 'like', "%$keyword%");