quanwei
2026-01-17 e1e2fe5710a5b5cd9c19bd3aa99c998a1a613ca8
admin/app/shop/model/supplier/Supplier.php
@@ -26,6 +26,9 @@
        if (isset($params['search']) && $params['search']) {
            $model = $model->where('name', 'like', '%' . $params['search'] . '%');
        }
        if(!empty($params['supplier_type'])){
            $model = $model->where('supplier_type', '=', $params['supplier_type']);
        }
        if(isset($params['shop_supplier_ids'])&&$params['shop_supplier_ids']){
            $model = $model->where('shop_supplier_id', 'in', $params['shop_supplier_ids']);
        }
@@ -151,19 +154,25 @@
            // 用户是否已绑定
            $user = null;
            $userChange = false;
            if($this['superUser'] && $supplier['user_id'] > 0 && $supplier['user_id'] != $this['superUser']['user_id']){
                $user = UserModel::detail($supplier['user_id']);
                if ($user['user_type'] != 1) {
                    $this->error = '该用户已绑定';
                    return false;
            if (!empty($supplier['user_id'])){
                if($this['superUser'] && $supplier['user_id'] > 0 && $supplier['user_id'] != $this['superUser']['user_id']){
                    $user = UserModel::detail($supplier['user_id']);
                    if ($user['user_type'] != 1) {
                        $this->error = '该用户已绑定';
                        return false;
                    }
                    $isApply = $this->isApply($supplier['user_id']);
                    if ($isApply) {
                        $this->error = '已经申请开店';
                        return false;
                    }
                    $userChange = true;
                }
                $isApply = $this->isApply($supplier['user_id']);
                if ($isApply) {
                    $this->error = '已经申请开店';
                    return false;
                }
                $userChange = true;
                $user=UserModel::detail($supplier['user_id']);
                $supplier['referee_id'] = $user['referee_id'];
            }
            $supplier = $this->createData($supplier);
            // 修改供应商
            $this->save($supplier);
            // 修改登录用户
@@ -235,7 +244,7 @@
    {
        $model = new static();
        // 查询列表数据
        return $model->field(['shop_supplier_id,name'])->where('is_delete', '=', '0')
        return $model->field(['shop_supplier_id,name,supplier_type'])->where('is_delete', '=', '0')
            ->order(['create_time' => 'desc'])
            ->select();
    }