Commit eae936ac by 杨树贤

修复bug

parent 26322940
Showing with 7 additions and 4 deletions
...@@ -7,11 +7,12 @@ use Barryvdh\DomPDF\PDF; ...@@ -7,11 +7,12 @@ use Barryvdh\DomPDF\PDF;
use App\Model\SupplierLogModel; use App\Model\SupplierLogModel;
use App\Http\Services\LogService; use App\Http\Services\LogService;
use App\Model\SupplierExtendModel; use App\Model\SupplierExtendModel;
use App\Model\SupplierChannelModel;
use App\Model\SupplierReceiptModel;
use App\Model\SupplierContractModel; use App\Model\SupplierContractModel;
use TijsVerkoyen\CssToInlineStyles\Exception;
use App\Http\Transformers\SupplierContractTransformer; use App\Http\Transformers\SupplierContractTransformer;
use App\Http\Controllers\Filter\SupplierContractFilter; use App\Http\Controllers\Filter\SupplierContractFilter;
use App\Model\SupplierChannelModel;
use App\Model\SupplierReceiptModel;
class SupplierContractService class SupplierContractService
{ {
...@@ -109,11 +110,13 @@ class SupplierContractService ...@@ -109,11 +110,13 @@ class SupplierContractService
} }
SupplierContractModel::where('id', $data['id'])->update($udpateData); SupplierContractModel::where('id', $data['id'])->update($udpateData);
} else { } else {
SupplierContractModel::insert([ SupplierContractModel::where('id', $insertId)->update([
'contract_file' => $fileData['data']['oss_file_url'], 'contract_file' => $fileData['data']['oss_file_url'],
'contract_no' => $this->generateContractNo($insertId) 'contract_no' => $this->generateContractNo($insertId)
]); ]);
} }
}else{
throw new Exception($fileData['msg']);
} }
} }
\DB::connection('web')->commit(); \DB::connection('web')->commit();
...@@ -121,7 +124,7 @@ class SupplierContractService ...@@ -121,7 +124,7 @@ class SupplierContractService
} catch (\Exception $e) { } catch (\Exception $e) {
\DB::connection('web')->rollBack(); \DB::connection('web')->rollBack();
\Log::error(json_encode($e->getMessage()) . ' ' . $e->getLine()); \Log::error(json_encode($e->getMessage()) . ' ' . $e->getLine());
return false; return $e->getMessage();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment