1

application/api/controller/Rescue.php

@@ -113,6 +113,7 @@ class Rescue extends Api
             ],$request
         );
         $where['processtime'] = time();
+
         SosBill::where('id',input('id',0))->update($where);
         $this->success('处理完成');
     }

application/common/model/Sos.php

@@ -49,7 +49,7 @@ class Sos extends BaseModel
     {
         self::beginTrans();
         try {
-            if(SosBill::where('id', $where['user_id'])->where('rescuers_id',$where['rescuers_id'])->whereTime('createtime',"today")->find()) return self::setErrorInfo('已求救，不用重复发起!');
+            if(SosBill::where('id', $where['user_id'])->where('rescuers_id',$where['rescuers_id'])->whereTime('createtime',"today")->where('status',0)->find()) return self::setErrorInfo('已求救，不用重复发起!');
             $where1 = $where;
             unset($where1['from']);
             unset($where1['re_url']);
@@ -61,13 +61,11 @@ class Sos extends BaseModel
             //tudo 模板信息
             if($where['from'] == "weixin") {
                 $data['first'] = "有人向你发起求救";
-                $data['keyword1'] = $user_phone;
-                $data['keyword2'] = $where['address'];
-                $data['keyword3'] = date("Y-m-d H:i:s");
-                $data['keyword4'] = "";
+                $data['keyword1'] = $where['address'];
+                $data['keyword2'] = date("Y-m-d H:i:s");
+                $data['keyword3'] = $user_phone;
                 $data['remark'] ="详细请点信息";
                 $rs =  WechatTempleService::sendTemplate($where['cid'], UserRelation::userIdToOpenId($where['rescuers_user_id']), WechatTempleService::EMERGANCY_RESCUE,$data,$where['re_url']);
-
             }
             if($res && $res1)
             {