Merge branch 'test'

application/api_broker/controller/Shop.php

@@ -701,15 +701,12 @@ class Shop extends Basic
         $result['shop_videos'] = $s_house->getHouseVideoList($params['id']);
         $result['shop_videos_length'] = $s_house->getHouseVideoLength();
 
-        $upload_video_num = $s_house->getHouseVideoNum($params['id']);
-        $result['is_upload_video'] = 0;
-        if ($upload_video_num < 3) {
+        $upload_id = $s_house->getHouseVideoNum($params['id']);
+        $result['is_upload_video'] = 0;  //不能上传视频
+        if (count($upload_id) < 3) {
             $result['is_upload_video'] = 1;
-        }
 
-        if ($result['is_upload_video'] == 1) {
-            $upload_video_num = $s_house->getHouseVideoNum($params['id'], 0, $this->agentId);
-            if ($upload_video_num) {
+            if (in_array($this->agentId, $upload_id)) {
                 $result['is_upload_video'] = 0;
             }
         }

application/index/controller/Finance.php

@@ -2974,7 +2974,7 @@ class Finance extends Basic
 
         try {
             $order = new OPayLogModel();
-            $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,';
+            $field = 'a.id,a.create_time,a.order_id,a.father_id,a.money,a.real_money,a.pay_type,a.type,a.source,a.transaction_fee,a.source,b.f_id,a.transfer_name,a.receipt_number,a.bargain_id,';
             $field .= 'e.name,a.income_time,e.store_id,b.house_id,b.order_no,a.report_id,a.house_number,a.is_dividend,a.last_transfer_time,a.industry_type,a.agent_id,d.internal_address as address,e.name as agent_name';
             $list = $order->getAddPayLogOrderListLimit($pageNo, $pageSize, $order_ = 'a.id desc', $field, $where);
             $data['total'] = $order->getAddPayLogOrderListLimitTotal($where);
@@ -3001,12 +3001,7 @@ class Finance extends Basic
                 }
 
                 if ($v['type'] != 10 && $v['type'] != 30) {
-                    $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$v['order_id']]);
-                    $bargain_id = $bargain_data['id'];
-                    if ($bargain_data['father_id'] != 0) {
-                        $bargain_id = $bargain_data['father_id'];
-                    }
-                    $list[$k]['bargain_id'] = empty($bargain_id)? '':$bargain_id;
+                    $list[$k]['bargain_id'] = empty($v['bargain_id'])? '':$v['bargain_id'];
                 } else {
                     $list[$k]['bargain_id'] = '';
                 }
@@ -4121,26 +4116,21 @@ class Finance extends Basic
         }
 
         $m_pay_adjustment = new OPayLogAdjustment();
-        $adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money', ['id'=>$this->params['id']]);
+        $adjustment_data = $m_pay_adjustment->getAdjustmentList('id,new_paylog_id,paylog_id,money,type', ['id'=>$this->params['id']]);
 
         if (empty($adjustment_data[0]['id'])) {
             return $this->response($code, '没有该调整详情');
         }
         $m_pay = new OPayLogModel();
-        $result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.money', ['a.id'=> $adjustment_data[0]['new_paylog_id']]);
+        $result['adjustment'] = $m_pay->getOrderHouse('a.id,a.order_id,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.money,a.bargain_id', ['a.id'=> $adjustment_data[0]['new_paylog_id']]);
         $result['adjustment_old'] = $m_pay->getOrderHouse('a.id,a.order_id,a.agent_id,a.agent_name,a.create_time,b.house_id,c.internal_address,a.income_time,a.type,a.pay_type,a.type', ['a.id'=> $adjustment_data[0]['paylog_id']]);
-        $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
-        $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
 
-        $bargain_data = $this->m_bargain->getDetail('id,father_id', ['order_id'=>$result['adjustment'][0]['order_id']]);
-
-        if ($bargain_data['father_id'] > 0) {
-            $bargain_id = $bargain_data['father_id'];
-        } else {
-            $bargain_id = $bargain_data['id'];
+        if (in_array($adjustment_data[0]['type'], [3,6,7])) {
+            $result['adjustment'][0]['bargain_id'] = 0;
         }
 
-        $result['adjustment'][0]['bargain_id'] = empty($bargain_id) ? '':$bargain_id;
+        $result['adjustment'] = $this->numberTransitionString($result['adjustment']);
+        $result['adjustment_old'] = $this->numberTransitionString($result['adjustment_old']);
         $result['money'] = $adjustment_data[0]['money'];
         $result['id'] = $adjustment_data[0]['id'];
         $code = 200;

application/index/service/HouseService.php

@@ -1037,13 +1037,7 @@ class HouseService
 
         $result = $m_video->getHouseVideo($field, $params);
 
-        if (CURRENT_URL == 'https://api.tonglianjituan.com/') {
-            $internet_path = CHAT_IMG_URL;
-        } elseif (CURRENT_URL == 'https://pre2.tonglianjituan.com/') {
-            $internet_path = 'http://pre2.tonglianjituan.com/resource/lib/Attachments/video/';
-        } else {
-            $internet_path = 'http://pre2.tonglianjituan.com/resource/lib/Attachments/video/';
-        }
+        $internet_path = CURRENT_URL.'/resource/lib/Attachments/video/';
         
         foreach ($result as $k=>$v) {
             $result_[$k]['id'] = $v['id'];
@@ -1079,11 +1073,10 @@ class HouseService
     /**
      * 商铺视频数量
      *
-     *
      * @param $house_id
      * @param int $is_check
      * @param int $agent_id
-     * @return int|string
+     * @return array
      */
     public function getHouseVideoNum($house_id, $is_check = 0, $agent_id = 0) {
         $m_video = new GHousesVideo();
@@ -1099,7 +1092,7 @@ class HouseService
         if ($agent_id) {
             $where['upload_id'] = $agent_id;
         }
-        $num = $m_video->getTotal($where);
-        return $num;
+        $id = $m_video->getVideoColumn('upload_id', $where);
+        return $id;
     }
 }
\ No newline at end of file

application/model/GHousesVideo.php

@@ -49,6 +49,26 @@ class GHousesVideo extends BaseModel
         return $this->db_->where($where)->update($data);
     }
 
+    /**
+     * @param $field
+     * @param $where
+     * @return array
+     */
+    public function getVideoColumn($field, $where)
+    {
+        return $this->db_->where($where)->column($field);
+    }
+
+    /**
+     * @param $pageNo
+     * @param $pageSize
+     * @param $field
+     * @param $params
+     * @return false|\PDOStatement|string|\think\Collection
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
     public function getHouseVideoList($pageNo,$pageSize,$field,$params)
     {
         $order  = "a.create_time desc";