diff --git a/app/Admin/Common/Rpc.php b/app/Admin/Common/Rpc.php index bb143e1..2163402 100644 --- a/app/Admin/Common/Rpc.php +++ b/app/Admin/Common/Rpc.php @@ -122,7 +122,7 @@ class Rpc * @param string $signName * @return string */ - public static function alisSmsSent($phone, $template, $templateParams, $signName='懒族生活'){ + public static function alisSmsSent($phone, $template, $templateParams, $signName='链街生活'){ $client = Client::factory(env('RPC_SITE_HOST')); $request = $client->request(uniqid(), self::ALI_SMS_SENT, diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index a4a477f..7286b35 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -69,7 +69,7 @@ class HomeController extends Controller $mp = LanzuMpInfo::where('admin_user_id',Admin::user()->id)->first(); $marketIds = Market::where('mp_id',$mp->id)->pluck('id')->toArray(); return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row) use ($marketIds) { $row->column(3, function (Column $column) { $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MP)); @@ -100,7 +100,7 @@ class HomeController extends Controller protected function lanzu_mm(Content $content) { return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row) { $row->column(3, function (Column $column) { $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MM)); @@ -121,7 +121,7 @@ class HomeController extends Controller { $uid = LanzuUserRelationBind::pluck('user_id')->toArray(); return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row)use ($uid) { $row->column(3, function (Column $column) { $column->row(new Examples\Community\TotalCommunity()); @@ -176,7 +176,7 @@ class HomeController extends Controller ->pluck('lanzu_order_main.user_id') ->toArray();//获取绑定社区的所有用户 return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row) use ($uid) { $row->column(3, function (Column $column) { $column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS)); @@ -224,7 +224,7 @@ class HomeController extends Controller { $marketId = Auth::getMarket(); return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row)use ($marketId) { $row->column(4, function (Column $column)use ($marketId) { $column->row(new Examples\ServiceCard\TotalStore($marketId,'商户数')); diff --git a/app/Admin/Controllers/ImsCjdcMarketController.php b/app/Admin/Controllers/ImsCjdcMarketController.php index ddcec20..4b24e1d 100644 --- a/app/Admin/Controllers/ImsCjdcMarketController.php +++ b/app/Admin/Controllers/ImsCjdcMarketController.php @@ -35,7 +35,7 @@ class ImsCjdcMarketController extends AdminController $grid->logo->image('', 50, 50); $grid->name; $grid->column('mp_id', '服务商')->display(function ($mid) { - if ($mid == 0) return '懒族自营'; + if ($mid == 0) return '链街自营'; $mp = LanzuMpInfo::find($mid); if (!$mp) { return '数据错误'; @@ -196,7 +196,7 @@ class ImsCjdcMarketController extends AdminController protected function getMpInfo() { $mps = LanzuMpInfo::all(); - $ret = [['id'=>'0','text'=>'懒族自营']]; + $ret = [['id'=>'0','text'=>'链街自营']]; foreach ($mps as $key => $value) { $item = []; $item['id'] = $value->id; diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 32c4c5c..3b06f47 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -125,7 +125,7 @@ class LanzuMmInfoController extends AdminController return Form::make(new LanzuMmInfo(), function (Form $form) { $form->display('id'); - $form->text('user_id', '懒ID')->placeholder('对应懒族小程序个人中心的懒ID')->required(); + $form->text('user_id', '懒ID')->placeholder('对应链街小程序个人中心的懒ID')->required(); $form->text('name')->required(); $form->text('phone')->required(); $form->select('market_id', '所属市场')->options('/api/getMarket')->required(); diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index 8e8bf90..3db1db8 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -116,7 +116,7 @@ class LanzuMpInfoController extends AdminController return Form::make(new LanzuMpInfo(), function (Form $form) { $form->display('id')->hideInDialog(); - $form->text('user_id','懒ID')->placeholder('对应懒族小程序个人中心的懒ID')->required(); + $form->text('user_id','懒ID')->placeholder('对应链街小程序个人中心的懒ID')->required(); $form->text('name', '姓名')->required(); $form->mobile('phone')->required(); $form->text('bank_name')->required(); @@ -201,7 +201,7 @@ class LanzuMpInfoController extends AdminController public function showData(Content $content) { return $content->header('控制面板') - ->description('欢迎回到懒族后台') + ->description('欢迎回到链街后台') ->body(function (Row $row) { $row->column(4, new \App\Admin\Metrics\Examples\MmInfo()); diff --git a/app/Admin/Controllers/v3/LanzuEmployeesController.php b/app/Admin/Controllers/v3/LanzuEmployeesController.php index 0612e5a..3e15608 100644 --- a/app/Admin/Controllers/v3/LanzuEmployeesController.php +++ b/app/Admin/Controllers/v3/LanzuEmployeesController.php @@ -39,7 +39,7 @@ class LanzuEmployeesController extends AdminController $grid->column('store_id')->display(function($storeId) use($storeList){ return isset($storeList[$storeId]) ? $storeList[$storeId] : ''; }); - + $grid->column('position')->display(function($position) use($positionList){ $item = ''; if(!empty($position) && is_array($position)){ @@ -50,7 +50,7 @@ class LanzuEmployeesController extends AdminController return $item; }); $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); - + $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList,$storeList){ $filter->equal('id'); $filter->equal('market_id')->select($marketList); @@ -136,7 +136,7 @@ class LanzuEmployeesController extends AdminController $form->multipleSelect('position')->required()->options(config('role.position')); $form->select('store_id')->options($storeList); $form->text('note')->maxLength(200); - + $form->hidden('status')->default(1); $form->saving(function(Form $form){ $id = $form->getKey(); @@ -146,7 +146,7 @@ class LanzuEmployeesController extends AdminController ['id','<>',$id?$id:0], ])->first(); if(!empty($store)){ - return $form->error('用户已经为懒族员工'); + return $form->error('用户已经为链街员工'); } }); $form->disableResetButton(); diff --git a/app/Admin/Repositories/v3/ReportCommunity.php b/app/Admin/Repositories/v3/ReportCommunity.php index 8f2bf4c..9157b06 100644 --- a/app/Admin/Repositories/v3/ReportCommunity.php +++ b/app/Admin/Repositories/v3/ReportCommunity.php @@ -70,17 +70,17 @@ class ReportCommunity extends EloquentRepository if(empty($startTime)){ $startTime = '2020-07-01 00:00:00'; }else{ - $startTime = $startTime . ' 00:00:00'; + $startTime = $startTime . ' 00:00:00'; } if(empty($endTime)){ $endTime = $nowDay . ' 23:59:59'; }else{ $endTime = $endTime . ' 23:59:59'; } - - // 获取懒族员工 + + // 获取链街员工 $employeesData = $this->getEmployeesData($selectsEmp,$params); - + $employeesData->orderBy('id','desc'); if($isPerPage){ $employeeList = $employeesData->paginate($this->perPage); @@ -92,13 +92,13 @@ class ReportCommunity extends EloquentRepository 'data' => $list ]; } - + if(!isset($employeeList['data']) || count($employeeList['data']) <= 0 ) { return $employeeList; } foreach ($employeeList['data'] as $key => &$employee) { - + // 根据员工信息，查询名下新增绑定的所有服务点 Statistics $newCsCount = CsInfoModel::where(function ($query) use ($employee) { $query->where('person_id', '=', $employee['user_id']) @@ -128,7 +128,7 @@ class ReportCommunity extends EloquentRepository ->whereIn('source_id', array_values(array_column($allCsInfos, 'admin_user_id'))) ->get() ->toArray(); - + // 平台新增用户数 Statistics $platNewUsers = OrderMainModel::select('user_id') ->where('type', '=', OrderMainModel::ORDER_TYPE_ONLINE) @@ -162,12 +162,12 @@ class ReportCommunity extends EloquentRepository $employee['bound_order_online_count'] = $totalOrdersCount; $employee['plat_new_user_order_online_count'] = $platNewUserOrdersCount; } - + return $employeeList; } /** - * 获取懒族员工 model + * 获取链街员工 model */ public function getEmployeesData($selects, $params = []) { @@ -180,18 +180,18 @@ class ReportCommunity extends EloquentRepository } if(isset($params['user_id']) && !empty($params['user_id'])){ $userId = explode(',',$params['user_id']); - $model->whereIn('user_id', $userId); + $model->whereIn('user_id', $userId); } if(isset($params['name']) && $params['name']){ $model->where('name','like','%'.$params['name'].'%'); } if(isset($params['market_id']) && is_numeric($params['market_id'])){ - $model->where('market_id', $params['market_id']); + $model->where('market_id', $params['market_id']); } - + if(!(isset($params['position']) && $params['position'] == 0)){ // $model->whereJsonContains('position', $positions); - + $model->where(function ($query) use ($positions) { foreach($positions as $key => $value){ if($key == 0){ diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 2b42a06..319f1a1 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -80,7 +80,7 @@ Route::group([ $router->resource('/service_personnel', 'v3\ServicePersonnelController'); $router->resource('/horseman', 'LanzuServiceHorsemanController'); - // 懒族员工 + // 链街员工 $router->resource('/employees', 'v3\LanzuEmployeesController'); $router->resource('/user', 'v3\UserController'); diff --git a/app/Libs/feier_print/api_php_demo.php b/app/Libs/feier_print/api_php_demo.php index 9ad4fca..e932db5 100644 --- a/app/Libs/feier_print/api_php_demo.php +++ b/app/Libs/feier_print/api_php_demo.php @@ -182,7 +182,7 @@ function FeiePrint($order_num) function PrintFormat($arr, $A, $B, $C, $D) { - $orderInfo = '懒族生活
'; + $orderInfo = '链街生活
'; $orderInfo .= '名称 单价 数量 金额
'; $orderInfo .= '--------------------------------
'; $shopname = ""; diff --git a/app/Models/ImsCjdcOrderMain.php b/app/Models/ImsCjdcOrderMain.php index 94cac0e..a3614e3 100644 --- a/app/Models/ImsCjdcOrderMain.php +++ b/app/Models/ImsCjdcOrderMain.php @@ -73,7 +73,7 @@ class ImsCjdcOrderMain extends Model const ORDER_PAY_BALANCE = 2; use HasDateTimeFormatter; - + protected $table = 'lanzu_order_main'; public $timestamps = false; @@ -170,7 +170,7 @@ class ImsCjdcOrderMain extends Model } /** - * 关联懒族员工表 + * 关联链街员工表 */ public function employees() { diff --git a/config/admin.php b/config/admin.php index 8f689d1..a58de77 100644 --- a/config/admin.php +++ b/config/admin.php @@ -11,7 +11,7 @@ return [ | login page. | */ - 'name' => '懒族后台管理系统', + 'name' => '链街后台管理系统', /* |-------------------------------------------------------------------------- @@ -22,8 +22,8 @@ return [ | `img` tag, eg 'Admin logo'. | */ - // 'logo' => '  懒族', - 'logo' => '   懒族 ', + // 'logo' => '  链街', + 'logo' => '   链街 ', /* |-------------------------------------------------------------------------- diff --git a/config/role.php b/config/role.php index afecfd8..3599adf 100644 --- a/config/role.php +++ b/config/role.php @@ -1,6 +1,6 @@ [ @@ -37,7 +37,7 @@ return [ 29 => '骑手', 30 => '服务专员', - + ], 'department_list' => [ diff --git a/resources/lang/zh-CN/lanzu-employees.php b/resources/lang/zh-CN/lanzu-employees.php index 9243d6a..0bd102a 100644 --- a/resources/lang/zh-CN/lanzu-employees.php +++ b/resources/lang/zh-CN/lanzu-employees.php @@ -1,10 +1,10 @@ - [ - 'LanzuEmployees' => '懒族员工', - 'lanzuEmployees' => '懒族员工', - 'lanzu_employees' => '懒族员工', - 'employees' => '懒族员工', + 'LanzuEmployees' => '链街员工', + 'lanzuEmployees' => '链街员工', + 'lanzu_employees' => '链街员工', + 'employees' => '链街员工', ], 'fields' => [ 'user_id' => '用户懒ID', diff --git a/resources/views/admin/markdown/csinfo.md b/resources/views/admin/markdown/csinfo.md index fe44945..f6869d6 100644 --- a/resources/views/admin/markdown/csinfo.md +++ b/resources/views/admin/markdown/csinfo.md @@ -1,7 +1,7 @@ ##社区站点使用说明 ####1.奖励设置 (目前只有相关授权的管理员才有权限) 添加站点前,确认奖励机制是合理,设置好站点的奖励. - 首单奖励: 从未在懒族生活线上或线下(当面付)下过单的用户. + 首单奖励: 从未在链街生活线上或线下(当面付)下过单的用户. 站点奖励: 该奖励机制与首单奖励类似. 流水奖励: 绑定用户在平台的后继消费,会按一定的百分比回馈给社区站点. 比如:流水奖励为5%,用户在平台消费了100, 服务站点会获得100*0.05=5(元)奖励.