|
@@ -4914,7 +4914,7 @@ class StoreOrderRepository extends BaseRepository
|
|
4914
|
*/
|
4914
|
*/
|
|
4915
|
public function merStatusExists(int $id, ?int $merId)
|
4915
|
public function merStatusExists(int $id, ?int $merId)
|
|
4916
|
{
|
4916
|
{
|
|
4917
|
- $where = ['order_id' => $id, 'is_del' => 0, 'paid' => 0, 'status' => 5];
|
|
|
|
|
|
4917
|
+ $where = ['order_id' => $id, 'is_del' => 0, 'paid' => 0, 'status' => 0];
|
|
4918
|
if ($merId) $where['mer_id'] = $merId;
|
4918
|
if ($merId) $where['mer_id'] = $merId;
|
|
4919
|
return $this->dao->merFieldExists($where);
|
4919
|
return $this->dao->merFieldExists($where);
|
|
4920
|
}
|
4920
|
}
|