conflict

app/Http/Controllers/Wap/Book/ChapterController.php

@@ -1559,12 +1559,12 @@ class ChapterController extends BaseController
             return $url;
         }
         //章节被删除的情况
-        if ($no_check->next_cid) {
-            $url = $h5_scheme . '://' . _domain() . '/reader?bid=' . $this->en_bid . '&cid=' . $no_check->next_cid;
-            return $url;
-        }
+//        if ($no_check->next_cid) {
+//            $url = $h5_scheme . '://' . _domain() . '/reader?bid=' . $this->en_bid . '&cid=' . $no_check->next_cid;
+//            return $url;
+//        }
         //章节被删除的是最后一章的情况
-        $url = $h5_scheme . '://' . _domain() . '/catalog?id=' . $this->en_bid . '&sequence=' . $no_check->sequence;
+        $url = $h5_scheme . '://' . _domain() . '/catalog?id=' . $this->en_bid;// . '&sequence=' . $no_check->sequence;
         return $url;
     }
 

app/Http/Controllers/Wap/User/CoflController.php

@@ -55,7 +55,7 @@ class CoflController extends Controller
         //$user = $this->getUsers($openid);
         $test_param = $request->input('test',0);
         //if($test_param ==1 || $test_param =='1' ) {
-        $user = $this->getUsersV2($openid,$bid);
+        $user = $this->getUsersV2($openid);
         //}
 
         if(!$user[0]){
@@ -111,7 +111,9 @@ class CoflController extends Controller
             $fee = $this->freeCurrencyFee($token,$rfee);
         }
 
-        $user = $this->getUsers($openid);
+        //$user = $this->getUsers($openid);
+        $user = $this->getUsersV2($openid);
+
         if(!$user || !$user[0] || !$user[1]) return redirect()->to($this->getLink().'?'.http_build_query($params));
 
         if($type == 'CRM'){
@@ -318,8 +320,8 @@ class CoflController extends Controller
      * @param $openid
      * @return array
      */
-    private function getUsersV2($openid,$bid){
-        $friend_link_uid_bind = DB::table('friend_link_uid_bind')->where('openid',$openid)->where('bid',$bid)->first();
+    private function getUsersV2($openid){
+        $friend_link_uid_bind = DB::table('friend_link_uid_bind')->where('openid',$openid)->first();
         if($friend_link_uid_bind) {
             $user = User::where('id',$friend_link_uid_bind->uid)->select('id','distribution_channel_id')->first();
             if($user) {
@@ -350,7 +352,7 @@ class CoflController extends Controller
             }
         }
         if(count($inner_channel_uid_list) == 1) {
-            $insert_data = ['uid'=>$inner_channel_uid_list[0]->id,'bid'=>$bid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+            $insert_data = ['uid'=>$inner_channel_uid_list[0]->id,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
             \Log::info('anchor:count $inner_channel_uid_list =1');
             DB::table('friend_link_uid_bind')->insert($insert_data);
             return [$inner_channel_uid_list[0]->id,$inner_channel_uid_list[0]->distribution_channel_id];
@@ -369,7 +371,7 @@ class CoflController extends Controller
             foreach ($users as $item) {
                 if($item->id == $year_order->uid) {
                     //筛选包年结束时间最后的UID
-                    $insert_data = ['uid'=>$item->id,'bid'=>$bid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+                    $insert_data = ['uid'=>$item->id,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
                     \Log::info('anchor:year_order');
                     DB::table('friend_link_uid_bind')->insert($insert_data);
                     return [$item->id,$item->distribution_channel_id];
@@ -384,10 +386,10 @@ class CoflController extends Controller
                 ->table('chapter_orders'.$table_prefix)
                 ->where('created_at','>=',date('Y-m-d H:i:s',strtotime('-3 day')))
                 ->where('uid',$each->id)
-                ->where('bid',$bid)
+                //->where('bid',$bid)
                 ->count('id');
             $book_order = BookOrder::where('uid',$each->id)
-                ->where('bid',$bid)
+                //->where('bid',$bid)
                 ->where('created_at','>=',date('Y-m-d H:i:s',strtotime('-3 day')))
                 ->first();
             if($book_order) {
@@ -401,7 +403,7 @@ class CoflController extends Controller
             }
         }
         if($users_select['id'] >0) {
-            $insert_data = ['uid'=>$users_select['user']->id,'bid'=>$bid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+            $insert_data = ['uid'=>$users_select['user']->id,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
             \Log::info('anchor:subs_chapter');
             DB::table('friend_link_uid_bind')->insert($insert_data);
             return [$users_select['user']->id,$users_select['user']->distribution_channel_id];
@@ -413,11 +415,11 @@ class CoflController extends Controller
             $chapter_order = DB::connection('chapter_order_mysql')
                 ->table('chapter_orders'.$table_prefix)
                 ->where('uid',$value->id)
-                ->where('bid',$bid)
+                //->where('bid',$bid)
                 ->orderBy('created_at','desc')
                 ->first();
             $book_order = BookOrder::where('uid',$value->id)
-                ->where('bid',$bid)
+                //->where('bid',$bid)
                 ->first();
             if($chapter_order ){
                 if(strtotime($chapter_order->created_at) > $users_select['create_time']) {
@@ -436,7 +438,7 @@ class CoflController extends Controller
 
         }
         if($users_select['id'] >0) {
-            $insert_data = ['uid'=>$users_select['user']->id,'bid'=>$bid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+            $insert_data = ['uid'=>$users_select['user']->id,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
             \Log::info('anchor:subs_');
             DB::table('friend_link_uid_bind')->insert($insert_data);
             return [$users_select['user']->id,$users_select['user']->distribution_channel_id];
@@ -444,7 +446,7 @@ class CoflController extends Controller
 
         if(count($inner_channel_uid_list)>1) {
             //有多个网站运营部UID，针对网站运营部UID进入到下一步筛选
-            $insert_data = ['uid'=>$inner_channel_uid_list[0]->id,'bid'=>$bid,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
+            $insert_data = ['uid'=>$inner_channel_uid_list[0]->id,'openid'=>$openid ,'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')];
             \Log::info('anchor:count $inner_channel_uid_list >1');
             DB::table('friend_link_uid_bind')->insert($insert_data);
             return [$inner_channel_uid_list[0]['id'],$inner_channel_uid_list[0]['distribution_channel_id']];