no message

app/Game/Services/AgentService.php

@@ -185,7 +185,7 @@ class AgentService
         }
         $h5link = env('H5_LINK', 'https://h5t.usgamewin.com/');
         if($ActName=='WheelFree100') {
-            $link = $h5link .'?act='. self::encodeAct($GlobalUID, $ActName);
+            $link = $h5link .'#/cashwheel?act='. self::encodeAct($GlobalUID, $ActName);
         }else{
             $link = $h5link .'act='.self::encodeAct($GlobalUID, $ActName);
         }

app/Http/Controllers/Game/ExtensionsController.php

@@ -98,34 +98,12 @@ class ExtensionsController
 
         $insert = 0;
         if($activity){
-            if($activity->Created<time()-86400*3 && $activity->State == 0){ //超过3天
-                $turnplate = [
-                    'times' => 1,
-                    'countdown' => 86400*3,
-                    'total_amount' => 4000,
-                    'collect_amount' => 0
-                ];
-
-                $insert = 1;
-                $insertData = json_decode(json_encode($activity),true);
-                $insertData['updated'] = time();
-                unset($insertData['ID'],$insertData['id']);
-
-                DB::connection('write')->table('agent.dbo.ActivityTurnplateHistory')->insert($insertData);
-                DB::connection('write')->table('agent.dbo.ActivityTurnplate')->where('UserID', $UserID)->delete();
-
-            }else{
-//                if($activity->LastFreeTimes+86400-3600<time()){
-//                    $activity->OldTimes += 1;
-//                    DB::connection('write')->table('agent.dbo.ActivityTurnplate')->where('UserID', $UserID)->update(['OldTimes'=> $activity->OldTimes,'LastFreeTimes' => time()]);
-//                }
-                $turnplate = [
-                    'times' => $activity->NewTimes+$activity->OldTimes,
-                    'countdown' => $activity->Created+86400*3-time(),
-                    'total_amount' => 4000,
-                    'collect_amount' => intval($activity->Amount)
-                ];
-            }
+            $turnplate = [
+                'times' => $activity->NewTimes+$activity->OldTimes,
+                'countdown' => $activity->Created+86400*3-time(),
+                'total_amount' => 4000,
+                'collect_amount' => intval($activity->Amount)
+            ];
         }else{
             $turnplate = [
                 'times' => 1,
@@ -162,10 +140,6 @@ class ExtensionsController
         $GlobalUID="";
         if($activity) {
             try {
-
-//                triggerInvite
-
-
                 $UserID = intval($activity->UserID ?? 0);
                 $FPID = $activity->FPID;
                 $GlobalUID = $activity->GlobalUID;
@@ -250,6 +224,7 @@ class ExtensionsController
     }
 
     public function kanOp(Request $request){
+//        return;
         //这里需要实现一个逻辑，就是我砍一刀我刚才拿配置还没注册
         $data=$this->getTurnplateActivity($request);
         $activity=$data['activity'];
@@ -261,15 +236,15 @@ class ExtensionsController
         $GlobalUID=$activity->GlobalUID;
 
 
-        if($activity->State != 0){
+        if($activity->State == 2){
 //            return apiReturnFail('invalid state');
             return apiReturnFail(['web.turnplate.invalid','Invalid state']);
         }
 
-        if($activity->Created<time()-86400*3){
-//            return apiReturnFail('expired');
-            return apiReturnFail(['web.turnplate.expired','Activity Expired']);
-        }
+//        if($activity->Created<time()-86400*3){
+////            return apiReturnFail('expired');
+//            return apiReturnFail(['web.turnplate.expired','Activity Expired']);
+//        }
         $type=1;
         $result = 0;
         $money = $activity->Amount;
@@ -288,64 +263,11 @@ class ExtensionsController
         }
 
         if($activity->TotalKan == 0){
-            $result = rand(3400,3600);
+            $result = rand(3200,3600);
             $type = 2;
         }else{
-            if($newTimes){
-                if($money<=3600){
-                    $type=2;
-                    $result = rand(150,200);
-                }elseif ($money>=3601 && $money<=3800){
-                    if(rand(0,100)>=50){
-                        $type=2;
-                        $result = rand(20,100);
-                    }else{
-                        $type=4;
-                        $result = 100;
-                    }
-                }elseif ($money>=3801 && $money<=3950){
-                    if(rand(0,100)>=0){
-                        $type=2;
-                        $result = rand(2,12);
-                    }else{
-                        $type=1;
-                        $result = 0;
-                    }
-                }elseif ($money>=3951 && $money<=3999){
-                    if(rand(0,100)>=0){
-                        $type=2;
-                        $result = min(rand(1,2),4000-$money);
-                    }else{
-                        $type=1;
-                        $result = 0;
-                    }
-                }
-            }else{
-                if($money<=3600){
-                    $type=2;
-                    $result = rand(150,200);
-                }elseif ($money>=3601 && $money<=3800){
-                    if(rand(0,100)>=50){
-                        $type=2;
-                        $result = rand(10,50);
-                    }else{
-                        $type=1;
-                        $result = 0;
-                    }
-                }elseif ($money>=3801 && $money<=3950){
-                    if(rand(0,100)>=60){
-                        $type=2;
-                        $result = rand(1,2);
-                    }else{
-                        $type=1;
-                        $result = 0;
-                    }
-                }elseif ($money>=3951 && $money<=3999){
-                    $type=1;
-                    $result = 0;
-                }
-            }
-
+            $type=1;
+            $result = 0;
         }
 
         DB::connection('write')->table('agent.dbo.ActivityTurnplate')->where('UserID', $UserID)->update(['NewTimes'=> $newTimes?$activity->NewTimes-1:$activity->NewTimes,'OldTimes'=> (!$newTimes)?$activity->OldTimes-1:$activity->OldTimes,'Amount' => $money+$result,'State' =>$money+$result>=4000?1:0,'TotalKan' => $activity->TotalKan+1 ]);
@@ -389,6 +311,7 @@ class ExtensionsController
 
 
     public function kanShare(Request $request) {
+        return;
 
         $user = LoginController::checkLogin($request);
 

app/Services/OrderServices.php

@@ -278,9 +278,9 @@ class  OrderServices
         if ($AdId && $payAmt) AfEvent::dispatch([$user_id, $payAmt, $AdId, $eventType]);
         try {
             //新邀请
-            (new AgentController())->processDeposit($user_id, $payAmt,$order_sn);
+            //(new AgentController())->processDeposit($user_id, $payAmt,$order_sn);
 
-//            AgentService::recordPerformance($user_id, $payAmt * NumConfig::NUM_VALUE);
+            AgentService::recordPerformance($user_id, $payAmt * NumConfig::NUM_VALUE);
         } catch (\Exception $exception) {
             Util::WriteLog("AgentService", $exception->getTraceAsString());
         }