Merge branch 'kuaiyingyong' of iqiyoo:zhuishuyun_wap into zhucj

app/Http/Controllers/QuickApp/WelcomeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\QuickApp;
 use App\Consts\PushConst;
 use App\Libs\Push\OPPOPush\OPPOPushCommon;
 use App\Modules\AdPosition\Services\AdPositionService;
+use App\Modules\Channel\Services\QappSendOrderContentShieldConfigService;
 use App\Modules\SendOrder\Models\QappSendOrder;
 use App\Modules\User\Models\QappCallbackParams;
 use App\Modules\User\Models\QappChannelAccount;
@@ -40,10 +41,19 @@ class WelcomeController extends BaseController
             }
             if ($send_order && $qappPackage) {
                 $this->sendOrderStatistic($send_order);//统计
+                $cid = $send_order->chapter_id;
+                $hash_bid = Hashids::encode($send_order->book_id);
+                $doShied = QappSendOrderContentShieldConfigService::doShied($this->send_order_id, _getIp());
+                if($doShied){
+                    if(isset($doShied['bid']) && isset($doShied['cid'])){
+                        $hash_bid = Hashids::encode($doShied['bid']);
+                        $cid = $doShied['cid'];
+                    }
+                }
                 return view('qapp.start')->with([
                     'package'       => $qappPackage->package,
-                    'hash_bid'      => Hashids::encode($send_order->book_id),
-                    'cid'           => $send_order->chapter_id,
+                    'hash_bid'      => $hash_bid,
+                    'cid'           => $cid,
                     'send_order_id' => $this->send_order_id,
                     'show_gzh'      => $showGzh
                 ]);