异常处理

app/Http/Controllers/Admin/SportsbkController.php

@@ -120,58 +120,86 @@ class SportsbkController extends Controller {
 //			$array[] = $key['guest'];
 //		}
 
-		//赛事下注单作废 处理
-		commonFunction::HandleInvalid($data,$match_id,$match_status,'lq');
-
-		$guestscore =array(
-			'1' => $data[1]['guest'],//第一节客队比分
-			'2' => $data[2]['guest'],//第二节客队比分
-			'3' => $data[3]['guest'],//第三节客队比分
-			'4' => $data[4]['guest'],//第四节客队比分
-		);
-		$homescore =array(
-			'1' => $data[1]['home'],//第一节客队比分
-			'2' => $data[2]['home'],//第二节客队比分
-			'3' => $data[3]['home'],//第三节客队比分
-			'4' => $data[4]['home'],//第四节客队比分
-		);
-		$updatainfo = [
-			"home_score"=>json_encode($homescore),
-			"guest_score"=>json_encode($guestscore),
-			"inning"=>json_encode($data),
-			"u_home_score"=>$data[5]['home'],
-			"u_guest_score"=>$data[5]['guest'],
-			"s_home_score"=>$data[6]['home'],
-			"s_guest_score"=>$data[6]['guest'],
-			"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
-			'is_correct'=>1
-		];
-
-		\App\Models\Stlqresult::where('match_id', $match_id)->update($updatainfo);
+		//修改蓝球比分前的比分数据
+		$res = \App\Models\Stlqresult::where('match_id', $match_id)->first();
+		$scores = json_decode($res['inning'],true);
+		$process = array();//进程
+		if($scores[1]['home'] != $data[1]['home'] || $scores[1]['guest'] != $data[1]['guest']){
+			$process[] = 'one';
+		}
+		if($scores[2]['home'] != $data[2]['home'] || $scores[2]['guest'] != $data[2]['guest']){
+			$process[] = 'two';
+		}
+		if($scores[3]['home'] != $data[3]['home'] || $scores[3]['guest'] != $data[3]['guest']){
+			$process[] = 'three';
+		}
+		if($scores[4]['home'] != $data[4]['home'] || $scores[4]['guest'] != $data[4]['guest']){
+			$process[] = 'four';
+		}
+		if($scores[5]['home'] != $data[5]['home'] || $scores[5]['guest'] != $data[5]['guest']){
+			$process[] = 'uhalf';
+		}
+		if($scores[6]['home'] != $data[6]['home'] || $scores[6]['guest'] != $data[6]['guest']){
+			$process[] = 'dhalf';
+		}
+		if($scores['all']['home'] != $data['all']['home'] || $scores['all']['guest'] != $data['all']['guest']){
+			$process[] = 'all';
+		}
 
-		$addnew = new \App\Models\Comendnotice();
-		$addnew->addcomendnotice($match_id,'lq');
+		if(!empty($process)){
+			//赛事下注单作废 处理
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'lq',$process);
 
-		$twoapp = new \App\Models\SportsBasket();
-		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
-		$newapp = new \App\Models\Stlqresult();
-		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
-
-		//添加赛事结果记录
-		$lastLog = \App\Models\Stlqresultlog::where([
-			['match_id', $match_id],
-			['type', 1]
-		])->orderBy('id', 'asc')->first();
-		if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
-			\App\Models\Stlqresultlog::insert([
-				'match_id' => $match_id,
-				'home_score' => json_encode($homescore),
-			    'guest_score' => json_encode($guestscore),
-				'inning' => json_encode($data),
-				'user_id' => session('adminInfo.admin_id'),
-				'type' => 1,
-				'create_at' => now()
-			]);
+			$guestscore =array(
+				'1' => $data[1]['guest'],//第一节客队比分
+				'2' => $data[2]['guest'],//第二节客队比分
+				'3' => $data[3]['guest'],//第三节客队比分
+				'4' => $data[4]['guest'],//第四节客队比分
+			);
+			$homescore =array(
+				'1' => $data[1]['home'],//第一节客队比分
+				'2' => $data[2]['home'],//第二节客队比分
+				'3' => $data[3]['home'],//第三节客队比分
+				'4' => $data[4]['home'],//第四节客队比分
+			);
+			$updatainfo = [
+				"home_score"=>json_encode($homescore),
+				"guest_score"=>json_encode($guestscore),
+				"inning"=>json_encode($data),
+				"u_home_score"=>$data[5]['home'],
+				"u_guest_score"=>$data[5]['guest'],
+				"s_home_score"=>$data[6]['home'],
+				"s_guest_score"=>$data[6]['guest'],
+				"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+				'is_correct'=>1
+			];
+
+			\App\Models\Stlqresult::where('match_id', $match_id)->update($updatainfo);
+
+			$addnew = new \App\Models\Comendnotice();
+			$addnew->addcomendnotice($match_id,'lq');
+
+			$twoapp = new \App\Models\SportsBasket();
+			$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+			$newapp = new \App\Models\Stlqresult();
+			$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
+
+			//添加赛事结果记录
+			$lastLog = \App\Models\Stlqresultlog::where([
+				['match_id', $match_id],
+				['type', 1]
+			])->orderBy('id', 'asc')->first();
+			if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
+				\App\Models\Stlqresultlog::insert([
+					'match_id' => $match_id,
+					'home_score' => json_encode($homescore),
+					'guest_score' => json_encode($guestscore),
+					'inning' => json_encode($data),
+					'user_id' => session('adminInfo.admin_id'),
+					'type' => 1,
+					'create_at' => now()
+				]);
+			}
 		}
 
 		return responseToJson(1);

app/Http/Controllers/Admin/SportsbqController.php

@@ -303,42 +303,84 @@ class SportsbqController extends Controller {
 //			$data[] = $key['guest'];
 //		}
 
-		//赛事下注单作废 处理
-		commonFunction::HandleInvalid($uscore,$match_id,$match_status,'bq');
-
-		$updatainfo = [
-			"home_score"=>$uscore['all']['home'],
-			"guest_score"=>$uscore['all']['guest'],
-			"match_score_t"=>json_encode($uscore),
-			"match_score"=>$uscore['all']['home'].':'.$uscore['all']['guest'],
-			"u_home_score"=>$uscore['five']['home'],
-			"u_guest_score"=>$uscore['five']['guest'],
-			'is_correct'=>1,
-		];
-		\App\Models\Stbqresult::where('match_id', $match_id)->update($updatainfo);
-
-		$addnew = new \App\Models\Comendnotice();
-		$addnew->addcomendnotice($match_id,'bq');
-
-		$twoapp = new \App\Models\SportsBase();
-		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
-		$newapp = new \App\Models\Stbqresult();
-		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
-
-		//添加赛事结果记录
-        $lastLog = \App\Models\Stbqresultlog::where([
-            ['match_id', $match_id],
-            ['type', 1]
-        ])->orderBy('id', 'desc')->first();
-        if(empty($lastLog) || $lastLog['match_score_t'] != json_encode($uscore)){
-            \App\Models\Stbqresultlog::insert([
-                'match_id' => $match_id,
-                'match_score_t' => json_encode($uscore),
-                'user_id' => session('adminInfo.admin_id'),
-                'type' => 1,
-                'create_at' => now()
-            ]);
-        }
+		//修改棒球比分前的比分数据
+		$res = \App\Models\Stbqresult::where('match_id', $match_id)->first();
+		$scores = json_decode($res['match_score_t'],true);
+		$process = array();//进程
+		if($scores[1]['home'] != $uscore[1]['home'] || $scores[1]['guest'] != $uscore[1]['guest']){
+			$process[] = 'one';
+		}
+		if($scores[2]['home'] != $uscore[2]['home'] || $scores[2]['guest'] != $uscore[2]['guest']){
+			$process[] = 'two';
+		}
+		if($scores[3]['home'] != $uscore[3]['home'] || $scores[3]['guest'] != $uscore[3]['guest']){
+			$process[] = 'three';
+		}
+		if($scores[4]['home'] != $uscore[4]['home'] || $scores[4]['guest'] != $uscore[4]['guest']){
+			$process[] = 'four';
+		}
+		if($scores[5]['home'] != $uscore[5]['home'] || $scores[5]['guest'] != $uscore[5]['guest']){
+			$process[] = 'five';
+		}
+		if($scores[6]['home'] != $uscore[6]['home'] || $scores[6]['guest'] != $uscore[6]['guest']){
+			$process[] = 'six';
+		}
+		if($scores[7]['home'] != $uscore[7]['home'] || $scores[7]['guest'] != $uscore[7]['guest']){
+			$process[] = 'seven';
+		}
+		if($scores[8]['home'] != $uscore[8]['home'] || $scores[8]['guest'] != $uscore[8]['guest']){
+			$process[] = 'eight';
+		}
+		if($scores[9]['home'] != $uscore[9]['home'] || $scores[9]['guest'] != $uscore[9]['guest']){
+			$process[] = 'nine';
+		}
+		if($scores['other']['home'] != $uscore['other']['home'] || $scores['other']['guest'] != $uscore['other']['guest']){
+			$process[] = 'other';
+		}
+		if($scores['five']['home'] != $uscore['five']['home'] || $scores['five']['guest'] != $uscore['five']['guest']){
+			$process[] = 'sfive';
+		}
+		if($scores['all']['home'] != $uscore['all']['home'] || $scores['all']['guest'] != $uscore['all']['guest']){
+			$process[] = 'all';
+		}
+		if(!empty($process)){
+			//赛事下注单作废 处理
+			commonFunction::HandleInvalid($uscore,$match_id,$match_status,'bq',$process);
+
+			$updatainfo = [
+				"home_score"=>$uscore['all']['home'],
+				"guest_score"=>$uscore['all']['guest'],
+				"match_score_t"=>json_encode($uscore),
+				"match_score"=>$uscore['all']['home'].':'.$uscore['all']['guest'],
+				"u_home_score"=>$uscore['five']['home'],
+				"u_guest_score"=>$uscore['five']['guest'],
+				'is_correct'=>1,
+			];
+			\App\Models\Stbqresult::where('match_id', $match_id)->update($updatainfo);
+
+			$addnew = new \App\Models\Comendnotice();
+			$addnew->addcomendnotice($match_id,'bq');
+
+			$twoapp = new \App\Models\SportsBase();
+			$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+			$newapp = new \App\Models\Stbqresult();
+			$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
+
+			//添加赛事结果记录
+			$lastLog = \App\Models\Stbqresultlog::where([
+				['match_id', $match_id],
+				['type', 1]
+			])->orderBy('id', 'desc')->first();
+			if(empty($lastLog) || $lastLog['match_score_t'] != json_encode($uscore)){
+				\App\Models\Stbqresultlog::insert([
+					'match_id' => $match_id,
+					'match_score_t' => json_encode($uscore),
+					'user_id' => session('adminInfo.admin_id'),
+					'type' => 1,
+					'create_at' => now()
+				]);
+			}
+		}
 
         return responseToJson(1);
 	}

app/Http/Controllers/Admin/SportswqController.php

@@ -291,44 +291,69 @@ class SportswqController extends Controller {
 //			$array[] = $key['guest'];
 //		}
 
-		//赛事下注单作废 处理
-		commonFunction::HandleInvalid($data,$match_id,$match_status,'wq');
-
-		$updatainfo = [
-			"home_player_score"=>$data['all']['home'],
-			"guest_player_score"=>$data['all']['guest'],
-			"inning"=>json_encode($data),
-			"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
-			"first_inning_score"=>$data[1]['home'].':'.$data[1]['guest'],
-			"second_inning_score"=>$data[2]['home'].':'.$data[2]['guest'],
-			"third_inning_score"=>$data[3]['home'].':'.$data[3]['guest'],
-			'is_correct'=>1
-		];
-
-		\App\Models\Stwqresult::where('match_id', $match_id)->update($updatainfo);
-
-		$addnew = new \App\Models\Comendnotice();
-		$addnew->addcomendnotice($match_id,'wq');
-
-		$twoapp = new \App\Models\SportsTennis();
-		$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
-		$newapp = new \App\Models\Stwqresult();
-		$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
+		//修改网球比分前的比分数据
+		$res = \App\Models\Stwqresult::where('match_id', $match_id)->first();
+		$scores = json_decode($res['inning'],true);
+		$process = array();//进程
+		if($scores[1]['home'] != $data[1]['home'] || $scores[1]['guest'] != $data[1]['guest']){
+			$process[] = 'one';
+		}
+		if($scores[2]['home'] != $data[2]['home'] || $scores[2]['guest'] != $data[2]['guest']){
+			$process[] = 'two';
+		}
+		if($scores[3]['home'] != $data[3]['home'] || $scores[3]['guest'] != $data[3]['guest']){
+			$process[] = 'three';
+		}
+		if($scores[4]['home'] != $data[4]['home'] || $scores[4]['guest'] != $data[4]['guest']){
+			$process[] = 'four';
+		}
+		if($scores[5]['home'] != $data[5]['home'] || $scores[5]['guest'] != $data[5]['guest']){
+			$process[] = 'five';
+		}
+		if($scores['all']['home'] != $data['all']['home'] || $scores['all']['guest'] != $data['all']['guest']){
+			$process[] = 'all';
+		}
 
-        //添加赛事结果记录
-        $lastLog = \App\Models\Stwqresultlog::where([
-            ['match_id', $match_id],
-            ['type', 1]
-        ])->orderBy('id', 'asc')->first();
-        if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
-            \App\Models\Stwqresultlog::insert([
-                'match_id' => $match_id,
-                'inning' => json_encode($data),
-                'user_id' => session('adminInfo.admin_id'),
-                'type' => 1,
-                'create_at' => now()
-            ]);
-        }
+		if(!empty($process)){
+			//赛事下注单作废 处理
+			commonFunction::HandleInvalid($data,$match_id,$match_status,'wq',$process);
+
+			$updatainfo = [
+				"home_player_score"=>$data['all']['home'],
+				"guest_player_score"=>$data['all']['guest'],
+				"inning"=>json_encode($data),
+				"match_score"=>$data['all']['home'].':'.$data['all']['guest'],
+				"first_inning_score"=>$data[1]['home'].':'.$data[1]['guest'],
+				"second_inning_score"=>$data[2]['home'].':'.$data[2]['guest'],
+				"third_inning_score"=>$data[3]['home'].':'.$data[3]['guest'],
+				'is_correct'=>1
+			];
+
+			\App\Models\Stwqresult::where('match_id', $match_id)->update($updatainfo);
+
+			$addnew = new \App\Models\Comendnotice();
+			$addnew->addcomendnotice($match_id,'wq');
+
+			$twoapp = new \App\Models\SportsTennis();
+			$twoapp->updatestatus('id',$match_id,['status'=>2,'utime'=>date('Y-m-d H:i:s')]);//修改赛事状态
+			$newapp = new \App\Models\Stwqresult();
+			$newapp->updatestatus('match_id',$match_id,['status'=>2,'update_time'=>date('Y-m-d H:i:s')]);//修改结果状态
+
+			//添加赛事结果记录
+			$lastLog = \App\Models\Stwqresultlog::where([
+				['match_id', $match_id],
+				['type', 1]
+			])->orderBy('id', 'asc')->first();
+			if(empty($lastLog) || $lastLog['inning'] != json_encode($data)){
+				\App\Models\Stwqresultlog::insert([
+					'match_id' => $match_id,
+					'inning' => json_encode($data),
+					'user_id' => session('adminInfo.admin_id'),
+					'type' => 1,
+					'create_at' => now()
+				]);
+			}
+		}
 
         return responseToJson(1);
 	}

app/Lib/Biz/Sport/Common.php

@@ -1591,8 +1591,36 @@ class Common
 
             }
             //合并待处理 注单
-			$orderData['invalid'] = array_merge($matchOdds_o,$matchOdds_t,$matchOdds_s,$matchOdds_f,$matchOdds_hh,$matchOdds_ll,$matchOdds_ff);
-            $orderData['settle'] = array_merge($matchOdds_one,$matchOdds_two,$matchOdds_three,$matchOdds_four,$matchOdds_half,$matchOdds_next,$matchOdds_fall);
+            $orderData['invalid'] = array();
+            $orderData['settle'] = array();
+            if(in_array('one',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_o);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_one);
+            }
+            if(in_array('two',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_t);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_two);
+            }
+            if(in_array('three',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_s);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_three);
+            }
+            if(in_array('four',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_f);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_four);
+            }
+            if(in_array('uhalf',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_hh);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_half);
+            }
+            if(in_array('dhalf',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_ll);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_next);
+            }
+            if(in_array('all',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_ff);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_fall);
+            }
         }
         //===end===
 
@@ -1680,8 +1708,33 @@ class Common
                 }
             }
             //合并待处理 注单
-            $orderData['invalid'] = array_merge($matchOdds_o,$matchOdds_t,$matchOdds_s,$matchOdds_fo,$matchOdds_fi,$matchOdds_ff);
-            $orderData['settle'] = array_merge($matchOdds_one,$matchOdds_two,$matchOdds_three,$matchOdds_four,$matchOdds_five,$matchOdds_fall);
+            //合并待处理 注单
+            $orderData['invalid'] = array();
+            $orderData['settle'] = array();
+            if(in_array('one',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_o);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_one);
+            }
+            if(in_array('two',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_t);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_two);
+            }
+            if(in_array('three',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_s);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_three);
+            }
+            if(in_array('four',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_fo);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_four);
+            }
+            if(in_array('five',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_fi);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_five);
+            }
+            if(in_array('all',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_ff);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_fall);
+            }
         }
         //===end===
 
@@ -1836,8 +1889,56 @@ class Common
 
             }
             //合并待处理 注单
-            $orderData['invalid'] = array_merge($matchOdds_o,$matchOdds_t,$matchOdds_th,$matchOdds_fo,$matchOdds_fi,$matchOdds_si,$matchOdds_se,$matchOdds_e,$matchOdds_n,$matchOdds_ot,$matchOdds_five,$matchOdds_ff);
-            $orderData['settle'] = array_merge($matchOdds_one,$matchOdds_two,$matchOdds_three,$matchOdds_four,$matchOdds_five,$matchOdds_six,$matchOdds_seven,$matchOdds_eight,$matchOdds_nine,$matchOdds_other,$matchOdds_fives,$matchOdds_fall);
+            $orderData['invalid'] = array();
+            $orderData['settle'] = array();
+            if(in_array('one',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_o);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_one);
+            }
+            if(in_array('two',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_t);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_two);
+            }
+            if(in_array('three',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_th);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_three);
+            }
+            if(in_array('four',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_fo);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_four);
+            }
+            if(in_array('five',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_fi);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_five);
+            }
+            if(in_array('six',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_si);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_six);
+            }
+            if(in_array('seven',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_se);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_seven);
+            }
+            if(in_array('eight',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_e);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_eight);
+            }
+            if(in_array('nine',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_n);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_nine);
+            }
+            if(in_array('other',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_ot);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_other);
+            }
+            if(in_array('sfive',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_five);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_fives);
+            }
+            if(in_array('all',$process)){
+                $orderData['invalid'] = array_merge($orderData['invalid'],$matchOdds_ff);
+                $orderData['settle'] = array_merge($orderData['settle'],$matchOdds_fall);
+            }
         }
         //===end===