Merge branch 'stabble'

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

@@ -98,6 +98,8 @@ class BookController extends BaseController
         if(!$this->checkUid()){
             return response()->error('WAP_NOT_LOGIN');
         }
+        // 上传的bid bug问题
+        if(strstr($bid,',')) $bid = explode(',',$bid)[0];
 
         if($this->uid == env('SPECIAL_USER_LOG',2)){
             myLog('special')->info('BookController::index bid is'.$bid);

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

@@ -304,6 +304,7 @@ class ChapterController extends BaseController
             return response()->error('WAP_NOT_LOGIN');
         }
         $this->en_bid = $bid;
+
         $bid = Hashids::decode($bid)[0];
         //获取图书信息
         $book_info = BookConfigService::getBookById($bid);

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

@@ -191,17 +191,23 @@ class OrdersController extends BaseController
         //}
         \Log::info('order:$template_id:' . $template_id);
         \Log::info('order:$distribution_channel_id:' . ($this->distribution_channel_id));
+
         if ($template_id == 2) { //模板2只有在长篇小说过来的用户才显示
-            if ($bid) {
-                $bid = Hashids::decode($bid)[0];
-                \Log::info('order:$bid:' . $bid);
-                $book = BookService::getBookById($bid);
-                \Log::info('order:$$book:' . json_encode($book));
-                if ($book->size < 200000) {
+            //部分渠道需要2元模板不管哪个入口进来都展示
+            $exclude_channels = explode(',', env('PRICE_TWO_SHOW_ALL_CHANNEL'));
+            if(!in_array($this->distribution_channel_id,$exclude_channels))
+            {
+                if ($bid) {
+                    $bid = Hashids::decode($bid)[0];
+                    \Log::info('order:$bid:' . $bid);
+                    $book = BookService::getBookById($bid);
+                    \Log::info('order:$$book:' . json_encode($book));
+                    if ($book->size < 200000) {
+                        $template_id = 1;
+                    }
+                } else {
                     $template_id = 1;
                 }
-            } else {
-                $template_id = 1;
             }
         }
         if($temp){

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

@@ -144,6 +144,7 @@ class OrdersController extends Controller
         if (empty($openid)) {
             $trade_no = date("YmdHis") . hexdec(uniqid());
             $params = compact('uid', 'product_id', 'distribution_channel_id', 'send_order_id', 'bid', 'trade_no', 'pay_redirect_url', 'fromtype', 'activity_id', 'n','suid');
+
             $redirect_url = env('CREATE_PAY_URL') . '?' . http_build_query($params);
             //$redirect_url  = env('CREATE_PAY_URL').'?uid='.$uid.'&product_id='.$product_id.'&distribution_channel_id='
             // .$distribution_channel_id.'&send_order_id='.$send_order_id.'&bid='.$bid.'&pay_redirect_url='.urlencode($pay_redirect_url)
@@ -314,9 +315,9 @@ class OrdersController extends Controller
         if ($request->has('cid')) {
             $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&cid=' . $request->input('cid');
         }
-        if ($hash_bid) {
-            $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&bid=' . $hash_bid;
-        }
+//        if ($hash_bid) {
+//            $pay_info['pay_redirect_url'] = $pay_info['pay_redirect_url'] . '&bid=' . $hash_bid;
+//        }
 
         if ($suid) {
             $prize_fee = (int)(($product_info->price*100)*0.1);

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

@@ -675,7 +675,7 @@ class WelcomeController extends BaseController
 
             //活动未开始
             if (time() < strtotime($activity_info->start_time)) {
-                return view('pay.order.longactivitysixtyeight', ['url' => '###', 'code' => -3, 'start_time' => '', 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
+                return view('pay.order.longactivitynine', ['url' => '###', 'code' => -3, 'start_time' => '', 'end_time' => date('Y-m-d', strtotime($activity_info->end_time) - 100)]);
             }
 
             //活动结束

app/Libs/Helpers.php

@@ -444,7 +444,8 @@ function specialChannelAuthInfo(){
         '4444'=>'wx431a3a692700b63a',
         '4445'=>'wx3c53a641ee53b984',
         '4456'=>'wxc8c1cfb70e568f0c',
-        //'4483'=>'wx4651668ca7f6be51',
+        '976'=>'wx21506dfd22a0dc9c',
+        '928'=>'wx76da3531773c1f39',
     ];
 }