Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -706,6 +706,13 @@ class Shop extends Basic
         if ($upload_video_num < 3) {
             $result['is_upload_video'] = 1;
         }
+
+        if (!$result['is_upload_video']) {
+            $upload_video_num = $s_house->getHouseVideoNum($params['id'], 0, $this->agentId);
+            if ($upload_video_num) {
+                $result['is_upload_video'] = 1;
+            }
+        }
         unset($result['external_image_id']);
         return $this->response("200", 'request success', $result);
     }

application/index/controller/Finance.php

@@ -3547,7 +3547,7 @@ class Finance extends Basic
             $pay_data = $pay_data[0];
             //成交报告id
 
-            if (empty($pay_data['order_id'])) {
+            if (empty($pay_data['bargain_id'])) {
                 $pay_data['bargain_id'] = "";
                 $pay_data['is_open'] = 0;
                 $pay_data['price'] = 0;

application/index/controller/Login.php

@@ -186,7 +186,7 @@ class Login extends Basic
         $user_data['AuthToken'] = $jwt->createToken($jwt_data);
 
         $expire = Config::get('session.expire');
-        $expire_time = $expire + time() - 300;
+        $expire_time = $expire + time() - 900;
         Session::set("userName", $user_data["name"]);
         Session::set("userId", $user_data["id"]);
         Session::set("expire_time", $expire_time);

application/index/extend/Basic.php

@@ -256,6 +256,7 @@ class Basic extends Controller
         $this->lastLoginTime = Session::get("lastLoginTime");
         $this->expire_time = Session::get("expire_time");
         if(empty($this->lastLoginTime)){
+            Session::clear();
             if ($this->request->isAjax()) {
                 echo json_encode(array( "code" => "300", "msg" => "登录失效,请重新登录", "data" => [], "type" => "json" ));exit;
             } else {

application/index/service/HouseService.php

@@ -1079,11 +1079,13 @@ class HouseService
     /**
      * 商铺视频数量
      *
+     *
      * @param $house_id
      * @param int $is_check
+     * @param int $agent_id
      * @return int|string
      */
-    public function getHouseVideoNum($house_id, $is_check = 0) {
+    public function getHouseVideoNum($house_id, $is_check = 0, $agent_id = 0) {
         $m_video = new GHousesVideo();
         $where['is_del'] = 0;
         $where['house_id'] = $house_id;
@@ -1093,6 +1095,10 @@ class HouseService
             case 2 :
                 $where['check_id'] = ['>', 0];break;   //已审核
         }
+
+        if ($agent_id) {
+            $where['upload_id'] = $agent_id;
+        }
         $num = $m_video->getTotal($where);
         return $num;
     }