Merge branch 'stabble' of iqiyoo:zhuishuyun_wap

app/Console/Commands/BookTest.php

@@ -318,7 +318,7 @@ class BookTest extends Command
     }
 
     private function you2(){
-        $sql1 = 'TRUNCATE yq_stats';
+        $sql1 = 'TRUNCATE yq_stats2';
         DB::update($sql1);
 
         $info = BookUser::where('type','ENABLE')->select('bid','uid','type','updated_at')
@@ -334,13 +334,13 @@ class BookTest extends Command
         $result = [];
         $chapter_model = new ChapterOrder();
         foreach ($info as $item){
-            $to_bids = YqUserBidRelation::where('uid',$item->uid)->select('to_bid','created_at')->get();
+            $to_bids = YqUserBidRelation::where('uid',$item->uid)->where('to_bid','>',0)->select('to_bid','created_at')->get();
             $from_bids = YqUserBidRelation::where('uid',$item->uid)->where('from_bid','>',0)->select('from_bid','created_at')->get();
             $chapter_model->setCurrentTable($item->uid);
             if($to_bids){
                 foreach ($to_bids as $v){
                     $to_bid = $v->to_bid;
-                    $time = $to_bids->created_at->format('Y-m-d H:i:s');
+                    $time = $v->created_at->format('Y-m-d H:i:s');
                     if(!$to_bid) continue;
                     $fee = $chapter_model->where('uid',$item->uid)
                         ->where('bid',$to_bid)
@@ -373,7 +373,6 @@ class BookTest extends Command
                 foreach ($from_bids as $from_bid){
                     $bid = $from_bid->from_bid;
                     $time = $from_bid->created_at->format('Y-m-d H:i:s');
-                    if(!$to_bid) continue;
                     $fee = $chapter_model->where('uid',$item->uid)
                         ->where('bid',$bid)
                         ->where('created_at','>=',$time)

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -575,7 +575,8 @@ class OrdersController extends BaseController
             'head_img' => '',
             'nickname' => $user->nickname
         ];
-        $help_pay_page_channel_id = env('HELP_PAY_PAGE_CHANNEL_ID', 123);
+        //$help_pay_page_channel_id = env('HELP_PAY_PAGE_CHANNEL_ID', 123);
+        $help_pay_page_channel_id = $this->distribution_channel_id;
         $url_format = '%s://site%s.%s.com/helppay?%s';
         $param = [];
         $param['su'] = $this->uid;

app/Http/Controllers/Wap/Pay/OrdersController.php

@@ -329,6 +329,7 @@ class OrdersController extends Controller
         if ($suid) {
             $prize_fee = (int)(($product_info->price*100)*0.1);
             $help_pay_page_channel_id = env('HELP_PAY_PAGE_CHANNEL_ID', 123);
+            $help_pay_page_channel_id = $distribution_channel_id;
             $url_format = '%s://site%s.%s.com/helppay?back=%s&su=%s';
             $pay_info['pay_redirect_url'] = $pay_redirect_url = sprintf(
                 $url_format,

app/Http/Controllers/Wap/Web/RedirectController.php

@@ -57,7 +57,7 @@ class RedirectController extends Controller
         //判断是否强制到服务号阅读
         if($link && $link->force_show_qrcode)
         {
-            Cookie::queue('force_show_qrcode', 1, 1);
+            //Cookie::queue('force_show_qrcode', 1, 1);
         }else{
             $query_param['source'] = 'wechatmsg';
         }