Merge branch 'stabble'

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

@@ -729,8 +729,8 @@ class CoflController extends Controller
             return view('jump.guidePersonalAccountOurs',['img'=>$cookie_crm_img,'name'=>$cookie_crm_name,'fee'=>$fee]);
         }
 
-        //$distribution_channel_id = decodeDistributionChannelId($channel_id);
-        $distribution_channel_id = $channel_id;
+        $distribution_channel_id = decodeDistributionChannelId($channel_id);
+        //$distribution_channel_id = $channel_id;
         //if(in_array($distribution_channel_id,Redis::SISMEMBER('')));
         //$out = false;
         $group = 'ACTIVE';

app/Modules/User/Services/UserService.php

@@ -436,6 +436,7 @@ WHERE u.openid in (SELECT openid from users WHERE  id = %s)";
             $i = 1;
             $chapter_model = new ChapterOrder();
             $chapter_model->setCurrentTable($to);
+
             foreach ($chapter_order_record as $chapter_order){
                 $temp[] = [
                     'distribution_channel_id'=>$distribution_channel_id,
@@ -449,6 +450,11 @@ WHERE u.openid in (SELECT openid from users WHERE  id = %s)";
                     'created_at'=>$chapter_order->created_at,
                     'updated_at'=>date('Y-m-d H:i:s')
                 ];
+                if($i % 100 == 0){
+                    $chapter_model->insert($temp);
+                    $temp = [];
+                }
+                $i ++;
             }
             //\Log::info('chapter order  is');
             //\Log::info($temp);