Merge branch 'stabble'

app/Console/Commands/CheckOrderStatus.php

@@ -6,6 +6,7 @@ use App\Jobs\SendTexts;
 use App\Modules\SendOrder\Services\SendOrderService;
 use App\Modules\Subscribe\Services\YearOrderService;
 use App\Modules\User\Models\UserMonthSign;
+use App\Modules\User\Services\ReadRecordService;
 use App\Modules\User\Services\UserMonthService;
 use App\Modules\User\Services\UserService;
 use Illuminate\Console\Command;
@@ -133,6 +134,7 @@ NOT EXISTS (SELECT id FROM user_month_order WHERE user_month_order.uid =user_mon
                 $send_order_name = $send_order_info->name;
             }
         }
+        $from_bid = ReadRecordService::getSimpleFirstReadRecord($uid);
         $init_order = [
             'distribution_channel_id' => $distribution_channel_id,
             'uid' => $uid,
@@ -146,7 +148,7 @@ NOT EXISTS (SELECT id FROM user_month_order WHERE user_month_order.uid =user_mon
             'send_order_id' => $send_order_id,
             'send_order_name' => $send_order_name,
             'order_type' => 'RECHARGE',
-            'from_bid' => '0',
+            'from_bid' => $from_bid,
             'from_type' => 'auto_month',
             'activity_id' => 0,
             'inner_send_order_id' => '',

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

@@ -429,7 +429,9 @@ class ChapterController extends BaseController
 
         $this->is_need_subscribe = !$force_subscribe;
 
-        if($bid == 5254){
+        //if($bid == 5254){
+        if(in_array($bid,[5254,3354,3362,3624,3364,3366,3363,3347,3355,3367,3348,3358]))
+        {
             $this->book_info->promotion_domain = 'leyuee.com';
             if(stripos($this->book_info->promotion_domain, $domain) === false){
                 return response()->error('WAP_DOMAIN_NOT_MATCH', [

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

@@ -14,6 +14,7 @@ use App\Modules\SendOrder\Services\SendOrderService;
 use App\Modules\Subscribe\Models\Order;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Modules\Subscribe\Services\YearOrderService;
+use App\Modules\User\Services\ReadRecordService;
 use App\Modules\User\Services\UserMonthService;
 use App\Modules\User\Services\UserService;
 use GuzzleHttp\Client;
@@ -217,6 +218,7 @@ class MonthOrderController extends Controller
                 $send_order_name = $send_order_info->name;
             }
         }
+        $from_bid = ReadRecordService::getSimpleFirstReadRecord($uid);
         $init_order = [
             'distribution_channel_id' => $distribution_channel_id,
             'uid' => $uid,
@@ -230,7 +232,7 @@ class MonthOrderController extends Controller
             'send_order_id' => $send_order_id,
             'send_order_name' => $send_order_name,
             'order_type' => 'RECHARGE',
-            'from_bid' => '0',
+            'from_bid' => $from_bid,
             'from_type' => 'auto_month',
             'activity_id' => 0,
             'inner_send_order_id' => '',

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

@@ -322,6 +322,9 @@ class WelcomeController extends BaseController
 
     private function outstandingYearOrder(){
         $outstanding_year_order = false;
+        if(in_array($this->distribution_channel_id,explode(',',env('CAN_NOT_OUTSTANDING_YEAR_ORDER_SITE')))){
+            return $outstanding_year_order;
+        }
         //if( in_array($this->distribution_channel_id,explode(',',env('OUTSTANDING_YEAR_ORDER_SITE'))) ){
             //if($this->uid%2 == 0){
                 //$userDivisionProperty = UserDivisionPropertyService::getUserProperty($this->uid);