1

app/api/controller/User.php

@@ -1358,10 +1358,18 @@ class User extends BaseController
         if (empty($post['contract_id'])) {
             return app('json')->fail("签字错误");
         }
-        $nickname=\app\model\api\User::where('uid',$uid)->value('nickname');
+        $time=time();
+        $info = (new UserContractRecordModel)->where("id",$post["contract_id"])->where('start_time','>',$time)->where('end_time','<',$time)->find();
+        if (!empty($info)){
+            $info = $info->toArray();
+        }else{
+            return app('json')->fail("合约未签约或已解约");
+
+        }
+//        $nickname=\app\model\api\User::where('uid',$uid)->value('nickname');
         $r = (new UserClockModel)->save([
             'uid'=>$uid,
-            'nickname' => $nickname,
+            'nickname' => $info['to_name'],
             'longitude'=>$post['longitude'],
             'latitude'=>$post['latitude'],
             'contract_id'=>$post['contract_id'],
@@ -1395,9 +1403,11 @@ class User extends BaseController
 //        }
         $r = (new ContractCommentModel)->save([
             'uid'=>$uid,
+            'name'=>$info['name'],
             'contract_id'=>$post['contract_id'],
             'contract_no'=>$info['contract_no'],
             'to_uid'=>$info['to_uid'],
+            'to_name'=>$info['to_name'],
             'content'=>$post['content'],
             'create_time'=>time()
         ]);

app/system/controller/Contract.php

@@ -300,7 +300,8 @@ class Contract extends BaseController
                 ['page', 1],
                 ['uid',0],  //甲方
                 ['to_uid',''], //乙方
-                ['contract_no', ''], //签约id
+                ['contract_id', ''], //签约id
+                ['contract_no', ''], //签约编号
                 ['time',[]],
             ], $request
         );