Merge remote-tracking branch 'origin/master'

app/workerapi/logic/MasterWorkerAgreeLogic.php

@@ -25,17 +25,18 @@ class MasterWorkerAgreeLogic extends BaseLogic
      */
     public static function sign($params)
     {
-        Db::startTrans();
         try {
             //查询协议
-            $agree = MasterWorkerAgree::where(['code'=>$params['code']])->findOrEmpty();
-            if($agree->isEmpty()){
-                throw new Exception('协议不存在');
-            }
-            if($agree->sign_status==1){
+            $agree = MasterWorkerAgree::where(['worker_id'=>$params['user_id'],'agree_type'=>'master_service_content'])->findOrEmpty();
+            if(!$agree->isEmpty() and $agree->sign_status==1){
                 throw new Exception('请勿重复签名');
             }
             //保存签名
+            if($agree->isEmpty()){
+                $agree->code = generate_sn(MasterWorkerAgree::class, 'code');
+                $agree->agree_type = 'master_service_content';
+                $agree->worker_id = $params['user_id'];
+            }
             $result = UploadService::base64Image(4, $params['sign']);
             $sign = $result['url'];
             $agree->sign = $sign;
@@ -45,10 +46,8 @@ class MasterWorkerAgreeLogic extends BaseLogic
 
             //pdf队列发送
             AddAgreementPdf::sendMq($agree->code,'https://'.$_SERVER['SERVER_NAME'].'/index/agreement/index'.'?code='.$agree->code);
-            Db::commit();
             return true;
         } catch (\Exception $e) {
-            Db::rollback();
             self::setError($e->getMessage());
             return false;
         }