|
@@ -1978,6 +1978,7 @@ class StoreOrder extends BaseModel
|
|
|
{
|
|
{
|
|
|
if (isset($where['status']) && $where['status'] != '') $model = self::statusWhere($where['status'], $model, $aler);
|
|
if (isset($where['status']) && $where['status'] != '') $model = self::statusWhere($where['status'], $model, $aler);
|
|
|
if (isset($where['is_del']) && $where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where($aler . 'is_del', $where['is_del']);
|
|
if (isset($where['is_del']) && $where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where($aler . 'is_del', $where['is_del']);
|
|
|
|
|
+ if (isset($where['store_id']) && $where['store_id'] != '' && $where['store_id'] != -1) $model = $model->where($aler . 'store_id', $where['store_id']);
|
|
|
if (isset($where['combination_id'])) {
|
|
if (isset($where['combination_id'])) {
|
|
|
if ($where['combination_id'] == '普通订单') {
|
|
if ($where['combination_id'] == '普通订单') {
|
|
|
$model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0);
|
|
$model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0);
|