Browse Source

懒族改为链街

master
李可松 4 years ago
parent
commit
356ca737a5
  1. 2
      app/Admin/Common/Rpc.php
  2. 10
      app/Admin/Controllers/HomeController.php
  3. 4
      app/Admin/Controllers/ImsCjdcMarketController.php
  4. 2
      app/Admin/Controllers/LanzuMmInfoController.php
  5. 4
      app/Admin/Controllers/LanzuMpInfoController.php
  6. 8
      app/Admin/Controllers/v3/LanzuEmployeesController.php
  7. 26
      app/Admin/Repositories/v3/ReportCommunity.php
  8. 2
      app/Admin/routes.php
  9. 2
      app/Libs/feier_print/api_php_demo.php
  10. 4
      app/Models/ImsCjdcOrderMain.php
  11. 6
      config/admin.php
  12. 4
      config/role.php
  13. 10
      resources/lang/zh-CN/lanzu-employees.php
  14. 2
      resources/views/admin/markdown/csinfo.md

2
app/Admin/Common/Rpc.php

@ -122,7 +122,7 @@ class Rpc
* @param string $signName * @param string $signName
* @return string * @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')); $client = Client::factory(env('RPC_SITE_HOST'));
$request = $client->request(uniqid(), $request = $client->request(uniqid(),
self::ALI_SMS_SENT, self::ALI_SMS_SENT,

10
app/Admin/Controllers/HomeController.php

@ -69,7 +69,7 @@ class HomeController extends Controller
$mp = LanzuMpInfo::where('admin_user_id',Admin::user()->id)->first(); $mp = LanzuMpInfo::where('admin_user_id',Admin::user()->id)->first();
$marketIds = Market::where('mp_id',$mp->id)->pluck('id')->toArray(); $marketIds = Market::where('mp_id',$mp->id)->pluck('id')->toArray();
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row) use ($marketIds) { ->body(function (Row $row) use ($marketIds) {
$row->column(3, function (Column $column) { $row->column(3, function (Column $column) {
$column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MP)); $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) protected function lanzu_mm(Content $content)
{ {
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row) { ->body(function (Row $row) {
$row->column(3, function (Column $column) { $row->column(3, function (Column $column) {
$column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_MM)); $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(); $uid = LanzuUserRelationBind::pluck('user_id')->toArray();
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row)use ($uid) { ->body(function (Row $row)use ($uid) {
$row->column(3, function (Column $column) { $row->column(3, function (Column $column) {
$column->row(new Examples\Community\TotalCommunity()); $column->row(new Examples\Community\TotalCommunity());
@ -176,7 +176,7 @@ class HomeController extends Controller
->pluck('lanzu_order_main.user_id') ->pluck('lanzu_order_main.user_id')
->toArray();//获取绑定社区的所有用户 ->toArray();//获取绑定社区的所有用户
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row) use ($uid) { ->body(function (Row $row) use ($uid) {
$row->column(3, function (Column $column) { $row->column(3, function (Column $column) {
$column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS)); $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(); $marketId = Auth::getMarket();
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row)use ($marketId) { ->body(function (Row $row)use ($marketId) {
$row->column(4, function (Column $column)use ($marketId) { $row->column(4, function (Column $column)use ($marketId) {
$column->row(new Examples\ServiceCard\TotalStore($marketId,'商户数')); $column->row(new Examples\ServiceCard\TotalStore($marketId,'商户数'));

4
app/Admin/Controllers/ImsCjdcMarketController.php

@ -35,7 +35,7 @@ class ImsCjdcMarketController extends AdminController
$grid->logo->image('', 50, 50); $grid->logo->image('', 50, 50);
$grid->name; $grid->name;
$grid->column('mp_id', '服务商')->display(function ($mid) { $grid->column('mp_id', '服务商')->display(function ($mid) {
if ($mid == 0) return '懒族自营';
if ($mid == 0) return '链街自营';
$mp = LanzuMpInfo::find($mid); $mp = LanzuMpInfo::find($mid);
if (!$mp) { if (!$mp) {
return '<span style="color: #ff0000">数据错误</span>'; return '<span style="color: #ff0000">数据错误</span>';
@ -196,7 +196,7 @@ class ImsCjdcMarketController extends AdminController
protected function getMpInfo() protected function getMpInfo()
{ {
$mps = LanzuMpInfo::all(); $mps = LanzuMpInfo::all();
$ret = [['id'=>'0','text'=>'懒族自营']];
$ret = [['id'=>'0','text'=>'链街自营']];
foreach ($mps as $key => $value) { foreach ($mps as $key => $value) {
$item = []; $item = [];
$item['id'] = $value->id; $item['id'] = $value->id;

2
app/Admin/Controllers/LanzuMmInfoController.php

@ -125,7 +125,7 @@ class LanzuMmInfoController extends AdminController
return Form::make(new LanzuMmInfo(), function (Form $form) { return Form::make(new LanzuMmInfo(), function (Form $form) {
$form->display('id'); $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('name')->required();
$form->text('phone')->required(); $form->text('phone')->required();
$form->select('market_id', '所属市场')->options('/api/getMarket')->required(); $form->select('market_id', '所属市场')->options('/api/getMarket')->required();

4
app/Admin/Controllers/LanzuMpInfoController.php

@ -116,7 +116,7 @@ class LanzuMpInfoController extends AdminController
return Form::make(new LanzuMpInfo(), function (Form $form) { return Form::make(new LanzuMpInfo(), function (Form $form) {
$form->display('id')->hideInDialog(); $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->text('name', '姓名')->required();
$form->mobile('phone')->required(); $form->mobile('phone')->required();
$form->text('bank_name')->required(); $form->text('bank_name')->required();
@ -201,7 +201,7 @@ class LanzuMpInfoController extends AdminController
public function showData(Content $content) public function showData(Content $content)
{ {
return $content->header('控制面板') return $content->header('控制面板')
->description('欢迎回到懒族后台')
->description('欢迎回到链街后台')
->body(function (Row $row) { ->body(function (Row $row) {
$row->column(4, new \App\Admin\Metrics\Examples\MmInfo()); $row->column(4, new \App\Admin\Metrics\Examples\MmInfo());

8
app/Admin/Controllers/v3/LanzuEmployeesController.php

@ -39,7 +39,7 @@ class LanzuEmployeesController extends AdminController
$grid->column('store_id')->display(function($storeId) use($storeList){ $grid->column('store_id')->display(function($storeId) use($storeList){
return isset($storeList[$storeId]) ? $storeList[$storeId] : ''; return isset($storeList[$storeId]) ? $storeList[$storeId] : '';
}); });
$grid->column('position')->display(function($position) use($positionList){ $grid->column('position')->display(function($position) use($positionList){
$item = ''; $item = '';
if(!empty($position) && is_array($position)){ if(!empty($position) && is_array($position)){
@ -50,7 +50,7 @@ class LanzuEmployeesController extends AdminController
return $item; return $item;
}); });
$grid->column('status')->width(3)->select(EmployeesModel::$_STATUS); $grid->column('status')->width(3)->select(EmployeesModel::$_STATUS);
$grid->filter(function (Grid\Filter $filter) use($marketList,$positionList,$storeList){ $grid->filter(function (Grid\Filter $filter) use($marketList,$positionList,$storeList){
$filter->equal('id'); $filter->equal('id');
$filter->equal('market_id')->select($marketList); $filter->equal('market_id')->select($marketList);
@ -136,7 +136,7 @@ class LanzuEmployeesController extends AdminController
$form->multipleSelect('position')->required()->options(config('role.position')); $form->multipleSelect('position')->required()->options(config('role.position'));
$form->select('store_id')->options($storeList); $form->select('store_id')->options($storeList);
$form->text('note')->maxLength(200); $form->text('note')->maxLength(200);
$form->hidden('status')->default(1); $form->hidden('status')->default(1);
$form->saving(function(Form $form){ $form->saving(function(Form $form){
$id = $form->getKey(); $id = $form->getKey();
@ -146,7 +146,7 @@ class LanzuEmployeesController extends AdminController
['id','<>',$id?$id:0], ['id','<>',$id?$id:0],
])->first(); ])->first();
if(!empty($store)){ if(!empty($store)){
return $form->error('用户已经为懒族员工');
return $form->error('用户已经为链街员工');
} }
}); });
$form->disableResetButton(); $form->disableResetButton();

26
app/Admin/Repositories/v3/ReportCommunity.php

@ -70,17 +70,17 @@ class ReportCommunity extends EloquentRepository
if(empty($startTime)){ if(empty($startTime)){
$startTime = '2020-07-01 00:00:00'; $startTime = '2020-07-01 00:00:00';
}else{ }else{
$startTime = $startTime . ' 00:00:00';
$startTime = $startTime . ' 00:00:00';
} }
if(empty($endTime)){ if(empty($endTime)){
$endTime = $nowDay . ' 23:59:59'; $endTime = $nowDay . ' 23:59:59';
}else{ }else{
$endTime = $endTime . ' 23:59:59'; $endTime = $endTime . ' 23:59:59';
} }
// 获取懒族员工
// 获取链街员工
$employeesData = $this->getEmployeesData($selectsEmp,$params); $employeesData = $this->getEmployeesData($selectsEmp,$params);
$employeesData->orderBy('id','desc'); $employeesData->orderBy('id','desc');
if($isPerPage){ if($isPerPage){
$employeeList = $employeesData->paginate($this->perPage); $employeeList = $employeesData->paginate($this->perPage);
@ -92,13 +92,13 @@ class ReportCommunity extends EloquentRepository
'data' => $list 'data' => $list
]; ];
} }
if(!isset($employeeList['data']) || count($employeeList['data']) <= 0 ) { if(!isset($employeeList['data']) || count($employeeList['data']) <= 0 ) {
return $employeeList; return $employeeList;
} }
foreach ($employeeList['data'] as $key => &$employee) { foreach ($employeeList['data'] as $key => &$employee) {
// 根据员工信息,查询名下新增绑定的所有服务点 Statistics // 根据员工信息,查询名下新增绑定的所有服务点 Statistics
$newCsCount = CsInfoModel::where(function ($query) use ($employee) { $newCsCount = CsInfoModel::where(function ($query) use ($employee) {
$query->where('person_id', '=', $employee['user_id']) $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'))) ->whereIn('source_id', array_values(array_column($allCsInfos, 'admin_user_id')))
->get() ->get()
->toArray(); ->toArray();
// 平台新增用户数 Statistics // 平台新增用户数 Statistics
$platNewUsers = OrderMainModel::select('user_id') $platNewUsers = OrderMainModel::select('user_id')
->where('type', '=', OrderMainModel::ORDER_TYPE_ONLINE) ->where('type', '=', OrderMainModel::ORDER_TYPE_ONLINE)
@ -162,12 +162,12 @@ class ReportCommunity extends EloquentRepository
$employee['bound_order_online_count'] = $totalOrdersCount; $employee['bound_order_online_count'] = $totalOrdersCount;
$employee['plat_new_user_order_online_count'] = $platNewUserOrdersCount; $employee['plat_new_user_order_online_count'] = $platNewUserOrdersCount;
} }
return $employeeList; return $employeeList;
} }
/** /**
* 获取懒族员工 model
* 获取链街员工 model
*/ */
public function getEmployeesData($selects, $params = []) public function getEmployeesData($selects, $params = [])
{ {
@ -180,18 +180,18 @@ class ReportCommunity extends EloquentRepository
} }
if(isset($params['user_id']) && !empty($params['user_id'])){ if(isset($params['user_id']) && !empty($params['user_id'])){
$userId = explode(',',$params['user_id']); $userId = explode(',',$params['user_id']);
$model->whereIn('user_id', $userId);
$model->whereIn('user_id', $userId);
} }
if(isset($params['name']) && $params['name']){ if(isset($params['name']) && $params['name']){
$model->where('name','like','%'.$params['name'].'%'); $model->where('name','like','%'.$params['name'].'%');
} }
if(isset($params['market_id']) && is_numeric($params['market_id'])){ 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)){ if(!(isset($params['position']) && $params['position'] == 0)){
// $model->whereJsonContains('position', $positions); // $model->whereJsonContains('position', $positions);
$model->where(function ($query) use ($positions) { $model->where(function ($query) use ($positions) {
foreach($positions as $key => $value){ foreach($positions as $key => $value){
if($key == 0){ if($key == 0){

2
app/Admin/routes.php

@ -80,7 +80,7 @@ Route::group([
$router->resource('/service_personnel', 'v3\ServicePersonnelController'); $router->resource('/service_personnel', 'v3\ServicePersonnelController');
$router->resource('/horseman', 'LanzuServiceHorsemanController'); $router->resource('/horseman', 'LanzuServiceHorsemanController');
// 懒族员工
// 链街员工
$router->resource('/employees', 'v3\LanzuEmployeesController'); $router->resource('/employees', 'v3\LanzuEmployeesController');
$router->resource('/user', 'v3\UserController'); $router->resource('/user', 'v3\UserController');

2
app/Libs/feier_print/api_php_demo.php

@ -182,7 +182,7 @@ function FeiePrint($order_num)
function PrintFormat($arr, $A, $B, $C, $D) function PrintFormat($arr, $A, $B, $C, $D)
{ {
$orderInfo = '<CB>懒族生活</CB><BR>';
$orderInfo = '<CB>链街生活</CB><BR>';
$orderInfo .= '名称 单价 数量 金额<BR>'; $orderInfo .= '名称 单价 数量 金额<BR>';
$orderInfo .= '--------------------------------<BR>'; $orderInfo .= '--------------------------------<BR>';
$shopname = ""; $shopname = "";

4
app/Models/ImsCjdcOrderMain.php

@ -73,7 +73,7 @@ class ImsCjdcOrderMain extends Model
const ORDER_PAY_BALANCE = 2; const ORDER_PAY_BALANCE = 2;
use HasDateTimeFormatter; use HasDateTimeFormatter;
protected $table = 'lanzu_order_main'; protected $table = 'lanzu_order_main';
public $timestamps = false; public $timestamps = false;
@ -170,7 +170,7 @@ class ImsCjdcOrderMain extends Model
} }
/** /**
* 关联懒族员工表
* 关联链街员工表
*/ */
public function employees() public function employees()
{ {

6
config/admin.php

@ -11,7 +11,7 @@ return [
| login page. | login page.
| |
*/ */
'name' => '懒族后台管理系统',
'name' => '链街后台管理系统',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -22,8 +22,8 @@ return [
| `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'. | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
| |
*/ */
// 'logo' => '<img src="/vendors/dcat-admin/images/logo.png" width="35"> &nbsp;懒族',
'logo' => '<img src="/vendors/dcat-admin/images/logo-head.png" width="35"> &nbsp;<span style="color:#ed7b1d;"> 懒族 </span>',
// 'logo' => '<img src="/vendors/dcat-admin/images/logo.png" width="35"> &nbsp;链街',
'logo' => '<img src="/vendors/dcat-admin/images/logo-head.png" width="35"> &nbsp;<span style="color:#ed7b1d;"> 链街 </span>',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

4
config/role.php

@ -1,6 +1,6 @@
<?php <?php
/** /**
* 懒族员工角色,职位
* 链街员工角色,职位
*/ */
return [ return [
'position'=>[ 'position'=>[
@ -37,7 +37,7 @@ return [
29 => '骑手', 29 => '骑手',
30 => '服务专员', 30 => '服务专员',
], ],
'department_list' => [ 'department_list' => [

10
resources/lang/zh-CN/lanzu-employees.php

@ -1,10 +1,10 @@
<?php
<?php
return [ return [
'labels' => [ 'labels' => [
'LanzuEmployees' => '懒族员工',
'lanzuEmployees' => '懒族员工',
'lanzu_employees' => '懒族员工',
'employees' => '懒族员工',
'LanzuEmployees' => '链街员工',
'lanzuEmployees' => '链街员工',
'lanzu_employees' => '链街员工',
'employees' => '链街员工',
], ],
'fields' => [ 'fields' => [
'user_id' => '用户懒ID', 'user_id' => '用户懒ID',

2
resources/views/admin/markdown/csinfo.md

@ -1,7 +1,7 @@
##社区站点使用说明 ##社区站点使用说明
####1.奖励设置 (目前只有相关授权的管理员才有权限) ####1.奖励设置 (目前只有相关授权的管理员才有权限)
添加站点前,确认奖励机制是合理,设置好站点的奖励. 添加站点前,确认奖励机制是合理,设置好站点的奖励.
首单奖励: 从未在懒族生活线上或线下(当面付)下过单的用户.
首单奖励: 从未在链街生活线上或线下(当面付)下过单的用户.
站点奖励: 该奖励机制与首单奖励类似. 站点奖励: 该奖励机制与首单奖励类似.
流水奖励: 绑定用户在平台的后继消费,会按一定的百分比回馈给社区站点. 比如:流水奖励为5%,用户在平台消费了100, 流水奖励: 绑定用户在平台的后继消费,会按一定的百分比回馈给社区站点. 比如:流水奖励为5%,用户在平台消费了100,
服务站点会获得100*0.05=5(元)奖励. 服务站点会获得100*0.05=5(元)奖励.

Loading…
Cancel
Save