Merge remote-tracking branch 'origin/master'

app/common/command/AddAgreementPdf.php

@@ -64,6 +64,7 @@ class AddAgreementPdf extends Command
         $agreement = MasterWorkerAgree::where('code', $code)->findOrEmpty();
         $agreement->pdf_url = $path.$pdf;
         $agreement->save();
+        return true;
     }
 
 

app/workerapi/logic/MasterWorkerAgreeLogic.php

@@ -7,6 +7,7 @@ use app\common\service\ConfigService;
 use app\common\service\UploadService;
 use think\Exception;
 use think\facade\Db;
+use think\Log;
 
 class MasterWorkerAgreeLogic extends BaseLogic
 {
@@ -35,9 +36,6 @@ class MasterWorkerAgreeLogic extends BaseLogic
         try {
             //查询协议
             $agree = MasterWorkerAgree::where(['worker_id'=>$params['user_id'],'agree_type'=>'master_service_content'])->findOrEmpty();
-            if(!$agree->isEmpty() and !empty($agree->sign)){
-                throw new Exception('请勿重复签名');
-            }
             //保存签名
             if($agree->isEmpty()){
                 $agree->code = generate_sn(MasterWorkerAgree::class, 'code');
@@ -51,6 +49,8 @@ class MasterWorkerAgreeLogic extends BaseLogic
             $agree->sign_time = time();
             $agree->save();
 
+            \think\facade\Log::write('签署协议'.$agree->code);
+
             //pdf队列发送
             AddAgreementPdf::sendMq($agree->code,'https://'.$_SERVER['SERVER_NAME'].'/index/agreement/index?code='.$agree->code);
             return true;