Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Admin/Controllers/GuideController.php

@@ -143,7 +143,7 @@ class GuideController extends AdminController
 			//插入权限表
 			if ($form->status == UserStatus::NORMAL) {
 				DB::table(config('admin-guide.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => $form->getKey()]);
+					->insertOrIgnore(['role_id' => 2, 'user_id' => $form->getKey()]);
 			}
 		});
     }

app/Admin/Controllers/SupplierController.php

@@ -158,7 +158,7 @@ class SupplierController extends AdminController
 			//插入权限表
 			if ($form->status == UserStatus::NORMAL) {
 				DB::table(config('admin-supplier.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => $form->getKey()]);
+					->insertOrIgnore(['role_id' => 2, 'user_id' => $form->getKey()]);
 			}
 		});
     }

app/Admin/Extensions/Grid/AuditAgent.php

@@ -110,8 +110,13 @@ class AuditAgent extends RowAction
 
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
+				$roleArr = [
+					1 => 2, //计调旅行社 role_id
+					2 => 2, //供应商旅行社 role_id
+					3 => 3, //组团旅行社 role_id
+				];
 				DB::table(config('admin-agent.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => $this->getKey()]);
+					->insertOrIgnore(['role_id' => $roleArr[$user->type], 'user_id' => $this->getKey()]);
 			}
 
 			//TODO 还需要插入 演示产品、公告、专题等

app/Admin/Extensions/Grid/AuditGuide.php

@@ -43,7 +43,7 @@ class AuditGuide extends RowAction
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
 				DB::table(config('admin-guide.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => $this->getKey()]);
+					->insertOrIgnore(['role_id' => 2, 'user_id' => $this->getKey()]);
 			}
 
 			return $this->response()->success("审核成功")->refresh();

app/Admin/Extensions/Grid/AuditSupplier.php

@@ -43,7 +43,7 @@ class AuditSupplier extends RowAction
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
 				DB::table(config('admin-supplier.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => $this->getKey()]);
+					->insertOrIgnore(['role_id' => 2, 'user_id' => $this->getKey()]);
 			}
 
 			return $this->response()->success("审核成功")->refresh();

app/AdminAgent/Controllers/UserController.php

@@ -38,7 +38,7 @@ class UserController extends AdminController
             $grid->column('mobile');
             $grid->column('nickname');
             $grid->column('status')->switch()->help('禁用后用户将无法登录');
-            $grid->column('is_verify')->switch();
+//            $grid->column('is_verify')->switch();
             $grid->column('created_at');
 
             $grid->filter(function (Grid\Filter $filter) {
@@ -46,7 +46,7 @@ class UserController extends AdminController
 
             	$filter->equal('id')->width(2);
 				$filter->equal('mobile')->width(2);
-				$filter->equal('is_verify')->select(['否', '是'])->width(2);
+//				$filter->equal('is_verify')->select(['否', '是'])->width(2);
             });
         });
     }
@@ -96,7 +96,7 @@ class UserController extends AdminController
 			$form->display('nickname');
             $form->text('mobile');
             $form->switch('status');
-            $form->switch('is_verify');
+//            $form->switch('is_verify');
         })->saving(function (Form $form) {
 			//不允许修改非自己的数据
 			if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) {
@@ -108,9 +108,9 @@ class UserController extends AdminController
 			if (!is_null($form->status)) { //为防止行内编辑出错，此处需要加判断
 				$form->status = $form->status ? 1 : 0;
 			}
-			if (!is_null($form->is_verify)) { //为防止行内编辑出错，此处需要加判断
+			/*if (!is_null($form->is_verify)) { //为防止行内编辑出错，此处需要加判断
 				$form->is_verify = $form->is_verify ? 1 : 0;
-			}
+			}*/
 
 			//不允许编辑的字段
 			$form->ignore(['id', 'agent_id', 'nickname', 'deleted_at']);

app/Console/Commands/OrderTimeout.php

@@ -41,14 +41,16 @@ class OrderTimeout extends Command
 	 */
     public function handle()
 	{
+		//需要处理的订单状态
+		$status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST];
+
 		//记录最小ID，下次查询时按ID正序查询，只处理大于该ID的订单，避免重复扫描数据库
-		$min_id = Order::query()->where('status', OrderStatus::UNPAID)->min('id');
+		$min_id = Order::query()->whereIn('status', $status_arr)->min('id');
+
     	while (true) {
 			Order::query()
-				->where([
-					['status', '=', OrderStatus::UNPAID],
-					['id', '>=', $min_id],
-				])
+				->where('id', '>=', $min_id)
+				->whereIn('status', $status_arr)
 				->whereNotNull('timeout')
 				->orderBy('id')
 				->chunk(100, function ($order) use (&$min_id) {
@@ -66,6 +68,7 @@ class OrderTimeout extends Command
 								DB::commit();
 							} catch (\Exception $exception) {
 								DB::rollBack();
+								$this->line("订单ID {$v->id} 错误：" . $exception->getMessage());
 							}
 						}
 						$min_id = $v->id;

app/Http/Controllers/Api/ChannelController.php

@@ -46,6 +46,21 @@ class ChannelController extends Controller
 			->whereRaw("FIND_IN_SET($channel_id, `channel_id`)")
 			->orderBy('id', 'DESC')
 			->simplePaginate();
+		$list = $this->paginatePicAddHost($list);
 		return $this->success($list);
 	}
+
+	//分页列表产品图片加域名
+	private function paginatePicAddHost($list)
+	{
+		if (!$list->isEmpty()) {
+			$prefix = Storage::disk('public')->url('');
+			foreach ($list->items() as $k=>&$v) {
+				$v->pictures = array_map(function($item) use ($prefix) {
+					return strpos($item, $prefix) === false ? $prefix . $item : $item;
+				}, $v->pictures);
+			}
+		}
+		return $list;
+	}
 }