Leadfyy.co
/
lianjie_admin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop 

* 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat: (56 commits)
  店铺_new换表
  退款状态变量
  优化提现按钮
  数据卡片增加提现按钮
  洗商品-添加时商品根据店铺所属市场添加市场
  优化订单详情数据显示
  优化订单详情商品显示
  配送员不存在时订单详情报错的问题
  用户余额表--清洗数据 ，user_type 为3的洗为4
  优化部分列表显示
  1
  修复社区提现金额显示不正确的问题
  数据卡片样式调整
  1
  增加商户数据卡片
  懒族员工添加电话号码
  框架更新
  firstCreate
  商品规格如果只填写一个问题显示报错问题修改
  社区 使用 firstCreate
  ...
master
Mike 5 years ago
parent
6385171f11 79f05aab76
commit
f2e51796e3
83 changed files with 1654 additions and 686 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/Admin/Actions/Grid/v3/GoodsCopy.php
  2. 11
      app/Admin/Common/Auth.php
  3. 49
      app/Admin/Common/Rpc.php
  4. 40
      app/Admin/Common/Sms.php
  5. 2
      app/Admin/Common/StoreQrCode.php
  6. 43
      app/Admin/Common/Type.php
  7. 34
      app/Admin/Common/WeChatQrCode.php
  8. 24
      app/Admin/Controllers/HomeController.php
  9. 28
      app/Admin/Controllers/ImsCjdcMarketController.php
  10. 26
      app/Admin/Controllers/ImsCjdcOrderMainController.php
  11. 99
      app/Admin/Controllers/LanzuAdminUserMarketController.php
  12. 18
      app/Admin/Controllers/LanzuArea.php
  13. 9
      app/Admin/Controllers/LanzuCsInfoController.php
  14. 20
      app/Admin/Controllers/LanzuCsWithdrawController.php
  15. 4
      app/Admin/Controllers/LanzuFinancialRecord.php
  16. 1
      app/Admin/Controllers/LanzuMmInfoController.php
  17. 8
      app/Admin/Controllers/LanzuMmWithdrawController.php
  18. 6
      app/Admin/Controllers/LanzuMpInfoController.php
  19. 5
      app/Admin/Controllers/LanzuMpWithdrawController.php
  20. 1
      app/Admin/Controllers/LanzuServiceRewardController.php
  21. 40
      app/Admin/Controllers/Type.php
  22. 8
      app/Admin/Controllers/v3/BannersController.php
  23. 4
      app/Admin/Controllers/v3/CategoryController.php
  24. 8
      app/Admin/Controllers/v3/GoodsActivityController.php
  25. 2
      app/Admin/Controllers/v3/GoodsCategoryController.php
  26. 18
      app/Admin/Controllers/v3/GoodsController.php
  27. 43
      app/Admin/Controllers/v3/GoodsNewController.php
  28. 154
      app/Admin/Controllers/v3/LanzuEmployeesController.php
  29. 150
      app/Admin/Controllers/v3/ServicePersonnelController.php
  30. 129
      app/Admin/Controllers/v3/StoreController.php
  31. 113
      app/Admin/Controllers/v3/UserController.php
  32. 8
      app/Admin/Extensions/CheckRow.php
  33. 2
      app/Admin/Extensions/MyDetailPage.php
  34. 20
      app/Admin/Extensions/OrderPrint.php
  35. 2
      app/Admin/Extensions/OrderStateHandle.php
  36. 4
      app/Admin/Forms/GoodsNewCopyForm.php
  37. 2
      app/Admin/Forms/RefundNote.php
  38. 4
      app/Admin/Forms/SelectHorseman.php
  39. 2
      app/Admin/Forms/v3/CategoryTieForm.php
  40. 2
      app/Admin/Forms/v3/GoodsCopyForm.php
  41. 17
      app/Admin/Metrics/Examples/Community/TotalAmount.php
  42. 2
      app/Admin/Metrics/Examples/Community/TotalCommunity.php
  43. 4
      app/Admin/Metrics/Examples/Community/TotalUser.php
  44. 27
      app/Admin/Metrics/Examples/Order/OrderData.php
  45. 4
      app/Admin/Metrics/Examples/ServiceCard/TotalMp.php
  46. 96
      app/Admin/Metrics/Examples/ServiceCard/TotalStore.php
  47. 16
      app/Admin/Repositories/LanzuAdminUserMarket.php
  48. 2
      app/Admin/Repositories/StoreUserReport.php
  49. 16
      app/Admin/Repositories/v3/LanzuEmployees.php
  50. 16
      app/Admin/Repositories/v3/User.php
  51. 15
      app/Admin/routes.php
  52. 160
      app/Console/Commands/MigrateGoods.php
  53. 2
      app/Console/Commands/MigrateOrderStatistics.php
  54. 14
      app/Console/Commands/MigrateStore.php
  55. 16
      app/Console/Commands/SetStoreBalance.php
  56. 67
      app/Console/Commands/SetUserBalanceType.php
  57. 10
      app/Models/ImsCjdcOrderMain.php
  58. 15
      app/Models/LanzuAdminUserMarket.php
  59. 19
      app/Models/LanzuArea.php
  60. 14
      app/Models/LanzuMpInfo.php
  61. 8
      app/Models/LanzuServiceHorseman.php
  62. 5
      app/Models/LanzuUserBalance.php
  63. 6
      app/Models/MpBalance.php
  64. 18
      app/Models/v3/Banners.php
  65. 2
      app/Models/v3/Category.php
  66. 10
      app/Models/v3/Goods.php
  67. 20
      app/Models/v3/GoodsActivity.php
  68. 10
      app/Models/v3/GoodsNew.php
  69. 91
      app/Models/v3/LanzuEmployees.php
  70. 57
      app/Models/v3/ServicePersonnel.php
  71. 14
      app/Models/v3/Store.php
  72. 10
      app/Models/v3/StoreNew.php
  73. 19
      app/Models/v3/User.php
  74. 85
      composer.lock
  75. 5
      config/filesystems.php
  76. 42
      config/role.php
  77. 192
      dcat_admin_ide_helper.php
  78. 13
      resources/lang/zh-CN/lanzu-admin-user-market.php
  79. 22
      resources/lang/zh-CN/lanzu-employees.php
  80. 2
      resources/lang/zh-CN/service-personnel.php
  81. 2
      resources/lang/zh-CN/store.php
  82. 25
      resources/lang/zh-CN/user.php
  83. 3
      resources/views/orderdetail.php

4
app/Admin/Actions/Grid/GoodsCopy.php → app/Admin/Actions/Grid/v3/GoodsCopy.php
View File

@ -1,10 +1,10 @@
<?php
namespace App\Admin\Actions\Grid;
namespace App\Admin\Actions\Grid\v3;
use Dcat\Admin\Grid\RowAction;
use Dcat\Admin\Widgets\Modal;
use App\Admin\Forms\GoodsCopyForm;
use App\Admin\Forms\v3\GoodsCopyForm;
class GoodsCopy extends RowAction
{

11
app/Admin/Common/Auth.php
View File

@ -5,6 +5,7 @@ namespace App\Admin\Common;
use App\Models\AdminRoles;
use App\Models\AdminRoleUsers;
use App\Models\AdminUsers;
use App\Models\LanzuAdminUserMarket;
use App\Models\LanzuUserBalance;
use Dcat\Admin\Admin;
use Dcat\Admin\Controllers\AdminController;
@ -23,10 +24,10 @@ class Auth extends AdminController
public static function addAdminUser($form, $model, $cid, $roles,$type=0)
{
$adu = new AdminUsers();
if (!$id) {
if (!$cid) {
return '-2';
}
$row = $model::find($id);
$row = $model::find($cid);
//>>1.添加前,去查询是否已存在相同的帐号
$count = $adu->where(['username' => $form->phone])->count();
@ -67,9 +68,9 @@ class Auth extends AdminController
public static function getMarket()
{
$adu = Admin::user();
if (in_array($adu->id,config('market_service.admin_user_id'))){
$marketId = config('market_service.market_id')[$adu->id];
return $marketId;
$row = LanzuAdminUserMarket::where('admin_user_id',$adu->id)->first();
if ($row){
return $row->market_id;
}
return false;
}

49
app/Admin/Common/Rpc.php
View File

@ -9,11 +9,13 @@ use Graze\GuzzleHttp\JsonRpc\Client;
class Rpc
{
const SEPARATE_ACCOUNTS = "/order/onlineComplete";
const ORDER_REFUND = "/order/onlineRefund";
const ORDER_SINGLE_REFUND = "/order/onlineSingleRefund";
const GET_DISTANCE = "/location/getDistanceByTencent";
const DO_BY_ORDER = "/badge/doByOrder";
const SEPARATE_ACCOUNTS = "/orders/onlineComplete";//订单完成
const ORDER_REFUND = "/orders/onlineRefund";//整笔订单退款
const ORDER_SINGLE_REFUND = "/orders/onlineSingleRefund";//订单单个商品退款
const GET_DISTANCE = "/location/getDistanceByTencent";//获取骑行距离
const DO_BY_ORDER = "/badge/doByOrder";//订单状态变更
const ALI_SMS_SENT = "/alisms/sent";//发短信
const FEI_E_PRINT = '/feie/doPrint';//订单打印
@ -112,5 +114,42 @@ class Rpc
return json_decode($response->getBody()->getContents(),true);
}
/**
* 阿里大于
* @param $phone
* @param $template
* @param $templateParams
* @param string $signName
* @return string
*/
public static function alisSmsSent($phone, $template, $templateParams, $signName='懒族生活'){
$client = Client::factory(env('RPC_SITE_HOST'));
$request = $client->request(uniqid(),
self::ALI_SMS_SENT,
[
'phone' => $phone,
'template'=>$template,
'templateParams'=> json_encode($templateParams),
'signName'=>$signName,
]);
$response = $client->send($request);
return $response->getBody()->getContents();
}
/**
* 订单打印
* @param $oid
* @return string
*/
public static function doPrint($oid)
{
$client = Client::factory(env('RPC_SITE_HOST'));
$request = $client->request(uniqid(),
self::FEI_E_PRINT,
['oid' => $oid]
);
$response = $client->send($request);
return $response->getBody()->getContents();
}
}

40
app/Admin/Common/Sms.php
View File

@ -12,34 +12,6 @@ use Graze\GuzzleHttp\JsonRpc\Client;
class Sms extends AdminController
{
/**
* 发送短信
* @throws ClientException
*/
public static function sent($params)
{
AlibabaCloud::accessKeyClient(env('ACCESS_KEY_ID'),env('ACCESS_SECRET'))
->regionId('cn-shenzhen')
->asDefaultClient();
try {
$result = AlibabaCloud::rpc()
->product('Dysmsapi')
->version('2017-05-25')
->action('SendSms')
->method('POST')
->host('dysmsapi.aliyuncs.com')
->options([
'query' => $params,
])
->request();
dd($result);
}catch (ClientException $e){
echo $e->getErrorMessage() . PHP_EOL;
}catch (ServerException $e){
echo $e->getErrorMessage() . PHP_EOL;
}
}
/**
* 远程RPC调用
* @param $phone
@ -48,16 +20,8 @@ class Sms extends AdminController
* @param string $signName
* @return string
*/
public static function rpcSent($phone, $template, $templateParams, $signName='懒族生活')
public static function rpcSent($phone, $template, $templateParams, $signName)
{
$client = Client::factory(env('RPC_SITE_HOST'));
$request = $client->request(uniqid(),'/alisms/sent', [
'phone' => $phone,
'template'=>$template,
'templateParams'=> json_encode($templateParams),
'signName'=>$signName,
]);
$response = $client->send($request);
return $response->getBody()->getContents();
return Rpc::alisSmsSent($phone, $template, $templateParams, $signName);
}
}

2
app/Admin/Common/StoreQRCode.php → app/Admin/Common/StoreQrCode.php
View File

@ -6,7 +6,7 @@ use Dcat\Admin\Controllers\AdminController;
use EasyWeChat\Factory;
use Intervention\Image\ImageManager;
class StoreQRCode extends AdminController
class StoreQrCode extends AdminController
{
protected $images;
protected $imageManager;

43
app/Admin/Common/Type.php
View File

@ -0,0 +1,43 @@
<?php
namespace App\Admin\Common;
class Type
{
/**
* 流水类型，大的分类，<100是奖励分账等收入项 >=100是提现消费等支出项
*/
const MONEY_TYPE_CS_PLAT_NEW_USER = 1; // 社区服务点新用户奖励（线上订单完成）
const MONEY_TYPE_CS_FIRST_ORDER = 2; // 社区服务点新用户线上首单奖励（线上订单完成）
const MONEY_TYPE_CS_OL_ORDER = 3; // 社区服务点用户线上订单分账（线上订单完成）
const MONEY_TYPE_STORE_PLAT_NEW_USER = 4; // 商户平台新用户奖励
const MONEY_TYPE_STORE_FIRST_ORDER = 5; // 商户当日首单奖励
const MONEY_TYPE_STORE_OL_ORDER_COMP = 6; // 商户线上订单完成收入
const MONEY_TYPE_STORE_OFL_ORDER_COMP = 7; // 商户线下订单完成收入
const MONEY_TYPE_USER_OL_ORDER_REFUND = 8; // 用户线上订单退款
const MONEY_TYPE_MM_PLAT_NEW_USER = 9; // 市场经理发展新用户
const MONEY_TYPE_MM_PLAT_NEW_STORE = 10; // 市场经理发展新商户
const MONEY_TYPE_MP_PLAT_NEW_USER = 11; // 服务商发展新用户
const MONEY_TYPE_MP_PLAT_NEW_STORE = 12; // 服务商发展新商户
const MONEY_TYPE_MP_OL_ORDER = 13; // 服务商线上订单分账（线上订单完成）
const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单
const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单
const MONEY_TYPE_MP = 102; //服务商提现类型
const MONEY_TYPE_MM = 103; //市场经理提现类型
const MONEY_TYPE_CS = 104; //社区提现类型
/**
* lanzu_user_balance 提现类型
*/
const BALANCE_USER_TYPE_U = 1; //用户提现类型
const BALANCE_USER_TYPE_MP = 2; //服务商提现类型
const BALANCE_USER_TYPE_MM = 3; //市场经理提现类型
const BALANCE_USER_TYPE_CS = 4; //社区提现类型
const BALANCE_USER_TYPE_STORE = 5; //商户提现类型
}

34
app/Admin/Common/WeChatQrCode.php
View File

@ -0,0 +1,34 @@
<?php
namespace App\Admin\Common;
use Dcat\Admin\Controllers\AdminController;
use EasyWeChat\Factory;
class WeChatQrCode extends AdminController
{
protected $images;
public function __construct()
{
$this->images = new Images();
}
/**
* 服务站专员评价小程序码
*/
public function getServicePersonnel($id)
{
$param = "page=details&id={$id}";
$path = "zh_cjdianc/pages/Liar/loginindex";
$codeImg = $this->images->createQrCode($param,$path);
$imgPath = 'public/upload/qrcode/'.date('Y') . '/' . date('m-d') . '/' . date('His').md5(time()).'.png';/* 生成唯一文件名 */
$res = $this->images->uploadOss($codeImg,$imgPath);
if($res){
return ['status' => true ,'path' => $imgPath];
}else{
return ['status' => false ,'path' => ''];
}
}
}

24
app/Admin/Controllers/HomeController.php
View File

@ -2,8 +2,11 @@
namespace App\Admin\Controllers;
use App\Admin\Common\Type;
use App\Admin\Metrics\Examples;
use App\Http\Controllers\Controller;
use App\Models\LanzuMpInfo;
use App\Models\v3\Market;
use Dcat\Admin\Controllers\Dashboard;
use Dcat\Admin\Layout\Column;
use Dcat\Admin\Layout\Content;
@ -56,15 +59,23 @@ class HomeController extends Controller
protected function lanzu_mp(Content $content)
{
$mp = LanzuMpInfo::where('admin_user_id',Admin::user()->id)->first();
$marketIds = Market::where('mp_id',$mp->id)->pluck('id')->toArray();
return $content->header('控制面板')
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(4, function (Column $column) {
->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));
});
$row->column(4, function (Column $column) {
$column->row(new Examples\ServiceCard\TotalMm());
$row->column(3, function (Column $column)use ($marketIds) {
$column->row(new Examples\ServiceCard\TotalStore($marketIds,'商户数'));
});
$row->column(3, function (Column $column)use ($marketIds) {
$column->row(new Examples\Order\OrderData('number',$marketIds,'订单数'));
});
$row->column(3, function (Column $column)use ($marketIds) {
$column->row(new Examples\Order\OrderData('amount',$marketIds,'订单金额(元)'));
});
});
}
@ -110,11 +121,10 @@ class HomeController extends Controller
->description('欢迎回到懒族后台')
->body(function (Row $row) {
$row->column(4, function (Column $column) {
$column->row(new Examples\Community\TotalUser());
$column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS));
});
$row->column(4, function (Column $column) {
$column->row(new Examples\Community\TotalAmount(Admin::user()->id,Type::BALANCE_USER_TYPE_CS));
$column->row(new Examples\Community\TotalUser());
});
});
}

28
app/Admin/Controllers/ImsCjdcMarketController.php
View File

@ -3,6 +3,7 @@
namespace App\Admin\Controllers;
use App\Admin\Repositories\ImsCjdcMarket;
use App\Models\LanzuArea;
use App\Models\LanzuMmInfo;
use App\Models\v3\Market;
use Dcat\Admin\Admin;
@ -83,7 +84,7 @@ class ImsCjdcMarketController extends AdminController
*/
protected function detail($id)
{
return Show::make($id, new ImsCjdcMarket(), function (Show $show) {
return Show::make($id, new Market(), function (Show $show) {
if (!\Admin::user()->isAdministrator() && $show->model()->mp_id == 0) {
$show->panel()
@ -103,23 +104,8 @@ class ImsCjdcMarketController extends AdminController
$show->addtime('创建时间');
$show->sort;
$show->status()->using([0=>'禁用',1=>'正常']);
$show->coordinates;
$show->remark;
$show->address;
$show->poundage;
$show->dn_poundage;
$show->dm_poundage;
$show->yd_poundage;
$show->loudspeaker_imei;
$show->dishes_menu_intro;
$show->create_time->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
}else{
return '-';
}
});
$show->created_at->as(function ($time){
if ($time){
return date('Y-m-d H:i',$time);
@ -151,6 +137,11 @@ class ImsCjdcMarketController extends AdminController
$form->text('name')->required();
$form->select('mp_id', '服务商')->options('/api/getMpInfo')->required();
$form->mobile('tel','电话')->required();
$form->select('province_id','省')
->options('/api/area')->required()
->load('city_id','/api/area');
$form->select('city_id','市')->required()->load('region_id','/api/area');
$form->select('region_id','区')->required();
$form->text('address')->required();
if ($form->isEditing()){
$form->text('coordinates')
@ -164,6 +155,7 @@ class ImsCjdcMarketController extends AdminController
->placeholder('输入 经纬度,如: 108.281552,22.83731')
->help("通过网址 <a href='https://lbs.amap.com/console/show/picker' target='_blank'>https://lbs.amap.com/console/show/picker</a> 获取经纬度");
}
$form->number('sort', '排序');
$form->switch('status', '状态');
$form->image('logo')->required();
@ -178,7 +170,7 @@ class ImsCjdcMarketController extends AdminController
$form->lat = $coordinates[1];
$form->deleteInput('coordinates');
});
$form->deleting(function (Form $form){
//删除市场前,校验该市场下是否存在市场经理
$mids = array_column($form->model()->toArray(), 'id');
@ -206,4 +198,6 @@ class ImsCjdcMarketController extends AdminController
}
return response()->json($ret);
}
}

26
app/Admin/Controllers/ImsCjdcOrderMainController.php
View File

@ -11,10 +11,6 @@ use App\Admin\Extensions\OrderPrint;
use App\Admin\Extensions\OrderRefund;
use App\Admin\Extensions\OrderStateHandle;
use App\Admin\Repositories\ImsCjdcOrderMain;
use App\Models\ImsCjdcMarket;
use App\Models\LanzuMarket;
use App\Models\LanzuMpInfo;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Layout\Content;
@ -59,35 +55,33 @@ class ImsCjdcOrderMainController extends AdminController
$grid->created_at('下单时间')->display(function ($time) {
return date('Y-m-d H:i:s',$time);
});
$grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
$state = $actions->row->state;
if ($state == 2) {
$actions->append(new OrderStateHandle('接单', 3));
$actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-danger">接单</div>', 3));
} elseif ($state == 311) {
$actions->append(new OrderStateHandle('完成', 4));
$actions->append(new OrderPrint('打印'));
$actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-warning">完成</div>', 4));
$actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
} elseif ($state == 3) {
$actions->append(new OrderPrint('打印'));
$actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '自送'));
$actions->append(new OrderPrint('<div type="button" style="width:140px" class="btn btn-outline-dark">打印</div>'));
$actions->append(new CheckRow($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-info">自送</div>'));
} elseif ($state == 8) {
$actions->append(new OrderStateHandle('同意退款', 9));
$actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '拒绝退款'));
$actions->append(new OrderStateHandle('<div type="button" style="width:140px" class="btn btn-outline-secondary">同意退款</div>', 9));
$actions->append(new OrderRefund($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-secondary">拒绝退款</div>'));
}
$actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '详情'));
$actions->append(new OrderDetail($actions->row->id, $grid->model()->getCurrentPage(), '<div type="button" style="width:140px" class="btn btn-outline-primary">详情</div>'));
});
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
$filter->equal('order_num');
});
$grid->disableViewButton();
$grid->disableEditButton();
$grid->disableDeleteButton();
$grid->disableCreateButton();
});
}

99
app/Admin/Controllers/LanzuAdminUserMarketController.php
View File

@ -0,0 +1,99 @@
<?php
namespace App\Admin\Controllers;
use App\Admin\Repositories\LanzuAdminUserMarket;
use App\Models\AdminUsers;
use App\Models\v3\Market;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
class LanzuAdminUserMarketController extends AdminController
{
/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
return Grid::make(new LanzuAdminUserMarket(), function (Grid $grid) {
$grid->column('id')->sortable();
$grid->column('admin_user_id','用户名')->display(function (){
return AdminUsers::where('id',$this->admin_user_id)->first()->name;
});
$grid->column('market_id','关联市场')->display(function (){
return Market::where('id',$this->market_id)->first()->name;
});
$grid->column('created_at')->display(function ($time){
return date('Y-m-d H:i:s',$time);
});
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
});
$grid->disableViewButton();
});
}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new LanzuAdminUserMarket(), function (Show $show) {
$show->field('id');
$show->field('admin_user_id');
$show->field('market_id');
$show->field('created_at');
$show->field('updated_at');
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
$this->getAdminUser();
return Form::make(new LanzuAdminUserMarket(), function (Form $form) {
$form->display('id');
if ($form->isCreating()){
$aumIds = \App\Models\LanzuAdminUserMarket::pluck('admin_user_id')->toArray();
$form->select('admin_user_id','用户名')->options($this->getAdminUser($aumIds));
}else{
$form->select('admin_user_id','用户名')->options($this->getAdminUser(null))->disable();
}
$form->select('market_id','关联市场')->options($this->getMarket());
$form->disableViewButton();
$form->disableEditingCheck();
$form->disableCreatingCheck();
$form->disableViewCheck();
});
}
public function getAdminUser($aumIds=null)
{
if ($aumIds){
$data = AdminUsers::whereNotIn('id',$aumIds)->pluck('name','id')->toArray();
}else{
$data = AdminUsers::pluck('name','id')->toArray();
}
return $data;
}
public function getMarket()
{
$data = Market::where('status',1)->pluck('name','id')->toArray();
return $data;
}
}

18
app/Admin/Controllers/LanzuArea.php
View File

@ -0,0 +1,18 @@
<?php
namespace App\Admin\Controllers;
use Dcat\Admin\Controllers\AdminController;
use \App\Models\LanzuArea as Area;
use Illuminate\Http\Request;
class LanzuArea extends AdminController
{
public function getArea(Request $request)
{
$pid = $request->get('q')??0;
return Area::getArea($pid);
}
}

9
app/Admin/Controllers/LanzuCsInfoController.php
View File

@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
use App\Admin\Common\Auth;
use App\Admin\Common\Images;
use App\Admin\Common\Type;
use App\Admin\Repositories\LanzuCsInfo;
use App\Models\AdminUsers;
@ -19,7 +20,6 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use \App\Models\LanzuCsInfo as modelCsInfo;
use Illuminate\Support\Facades\DB;
use function foo\func;
class LanzuCsInfoController extends AdminController
@ -49,7 +49,10 @@ class LanzuCsInfoController extends AdminController
return LanzuUserRelationBind::getCount($this->admin_user_id);
});
$grid->column('balance', '可提现金额')->display(function (){
$balance = LanzuUserBalance::where('source_id',$this->admin_user_id)->where('user_type',4)->first();
$balance = LanzuUserBalance::firstOrCreate(
['source_id'=>$this->admin_user_id,'user_type'=>Type::BALANCE_USER_TYPE_CS],
['balance'=>0]
);
return $balance->balance;
});
$grid->column('qrcode_path', '二维码')->image('', 50, 50);
@ -121,7 +124,7 @@ class LanzuCsInfoController extends AdminController
$model = new modelCsInfo();
if ($form->isCreating()) {
//>>1.添加登录帐号
$res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',4);
$res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',Type::BALANCE_USER_TYPE_CS);
if ($res == -1) {
return $form->error('该手机号作为登陆帐号已存在!');
} elseif ($res == -2) {

20
app/Admin/Controllers/LanzuCsWithdrawController.php
View File

@ -5,15 +5,14 @@ namespace App\Admin\Controllers;
use App\Admin\Common\WxPay;
use App\Admin\Repositories\LanzuCsWithdraw;
use App\Models\FinancialRecord;
use App\Models\FinancialRecord0;
use App\Models\ImsCjdcUser;
use App\Models\LanzuCsInfo;
use App\Models\LanzuUserBalance;
use app\Request;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use App\Admin\Common\Type;
use Dcat\Admin\Controllers\AdminController;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@ -45,6 +44,7 @@ class LanzuCsWithdrawController extends AdminController
}
$grid->disableViewButton();
$grid->disableDeleteButton();
$grid->disableActions();
$grid->id->sortable();
$grid->column('csInfo.name', '提现用户');
$grid->money;
@ -93,7 +93,7 @@ class LanzuCsWithdrawController extends AdminController
if ($user->isRole('lanzu_cs')) {//如果是社区站点角色
$cs = LanzuCsInfo::where('admin_user_id', $user->id)->first();
if ($cs) {
$form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, 3))->disable();
$form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id,Type::BALANCE_USER_TYPE_CS))->disable();
$form->hidden('cs_id', '提现用户id')->value($cs->id);
$form->text('csInfo.name', '提现用户')->value($cs->name)->disable();
$form->number('money')->min(env('MIN_MONEY'))->max(env('MAX_MONEY'));
@ -113,13 +113,13 @@ class LanzuCsWithdrawController extends AdminController
}
$form->saved(function () use ($cs, $form) {//扣减提现金额
LanzuUserBalance::reduceBalance($cs->admin_user_id, 3, $form->money);
LanzuUserBalance::reduceBalance($cs->admin_user_id, Type::BALANCE_USER_TYPE_CS, $form->money);
});
} else {//编辑操作
$aduid = LanzuCsInfo::where('id', $form->model()->cs_id)->pluck('admin_user_id')->first();
$form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, 3));
$form->display('amount', '可提现金额')->value(LanzuUserBalance::getBalance($aduid, Type::BALANCE_USER_TYPE_CS));
$form->display('cs_id', '提现用户')->value($form->model()->name);
$form->display('money');
@ -139,7 +139,7 @@ class LanzuCsWithdrawController extends AdminController
$form->saved(function (Form $form) use ($aduid) {
if ($form->status == -1) {//如何审核被拒绝,退回提现金额
LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money);
LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money);
} elseif ($form->status == 1) {//调用微信企业付
//获取站点信息
$csInfo = LanzuCsInfo::find($form->model()->cs_id);
@ -164,9 +164,9 @@ class LanzuCsWithdrawController extends AdminController
//添加流水记录
$model = FinancialRecord::getFinancialRecordModel($csInfo->admin_user_id);
$model->user_id = $csInfo->admin_user_id;
$model->user_type = 4;
$model->user_type = Type::BALANCE_USER_TYPE_CS;
$model->money = $form->model()->money;
$model->money_type = 104;
$model->money_type = Type::MONEY_TYPE_CS;
$model->desc = '社区站点提现';
$model->comment = '社区站点提现';
$model->save();
@ -176,7 +176,7 @@ class LanzuCsWithdrawController extends AdminController
$model->user_id = -1;
$model->user_type = -1;
$model->money = $form->model()->money;
$model->money_type = 104;
$model->money_type = Type::MONEY_TYPE_CS;
$model->desc = '社区站点提现';
$model->comment = '社区站点提现';
$model->save();
@ -186,7 +186,7 @@ class LanzuCsWithdrawController extends AdminController
} else {
DB::transaction(function () use ($aduid, $form) {
//提现失败,退回提现金额
LanzuUserBalance::returnBalance($aduid, 3, $form->model()->money);
LanzuUserBalance::returnBalance($aduid, Type::BALANCE_USER_TYPE_CS, $form->model()->money);
//更改提现状态为-2 提现失败
\App\Models\LanzuCsWithdraw::updateStatus($form->model()->id, -2);

4
app/Admin/Controllers/LanzuFinancialRecord.php
View File

@ -9,6 +9,7 @@ use App\Models\FinancialRecord;
use App\Models\FinancialRecord0;
use App\Models\ImsCjdcUser;
use App\Models\LanzuCsInfo;
use App\Models\LanzuMpInfo;
use Dcat\Admin\Admin;
use Dcat\Admin\Controllers\AdminController;
use Dcat\Admin\Form;
@ -60,9 +61,12 @@ class LanzuFinancialRecord extends AdminController
$filter->equal('id');
if (!$adu->isRole('lanzu_cs')&&$type==4) {
$filter->equal('user_id', '社区站点')->select(LanzuCsInfo::selectCsInfo());
}elseif (!$adu->isRole('lanzu_mp')&&$type==2){
$filter->equal('user_id', '服务商')->select(LanzuMpInfo::selectCsInfo());
}
});
$grid->disableActions();
$grid->disableViewButton();
$grid->disableCreateButton();
$grid->disableEditButton();

1
app/Admin/Controllers/LanzuMmInfoController.php
View File

@ -3,6 +3,7 @@
namespace App\Admin\Controllers;
use App\Admin\Common\Auth;
use App\Admin\Common\Type;
use App\Admin\Repositories\LanzuMmInfo;
use App\Models\AdminUsers;
use \App\Models\AdminRoles;

8
app/Admin/Controllers/LanzuMmWithdrawController.php
View File

@ -3,6 +3,7 @@
namespace App\Admin\Controllers;
use App\Admin\Common\FinancialRecord;
use App\Admin\Common\Type;
use App\Admin\Repositories\LanzuMmWithdraw;
use App\Models\ImsCjdcUser;
use App\Models\LanzuMmWithdraw as MmWithdraw;
@ -187,7 +188,7 @@ class LanzuMmWithdrawController extends AdminController
//添加流水记录
$adminUserId = $mm->admin_user_id;
$money = $form->model()->money;
FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, 103, '市场经理提现', '市场经理提现');
FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MM, $money, Type::MONEY_TYPE_MM, '市场经理提现', '市场经理提现');
} else {
//如果提现失败,返回提现金额
MpBalance::returnBalance($mm->admin_user_id, Type::BALANCE_USER_TYPE_MM, $form->model()->money);
@ -303,9 +304,4 @@ class LanzuMmWithdrawController extends AdminController
}
public function mmInfoList()
{
echo 11;
}
}

6
app/Admin/Controllers/LanzuMpInfoController.php
View File

@ -3,6 +3,7 @@
namespace App\Admin\Controllers;
use App\Admin\Common\Auth;
use App\Admin\Common\Type;
use App\Admin\Extensions\CheckRow;
use App\Admin\Metrics\Examples\TotalUsers;
use App\Admin\Repositories\LanzuMpInfo;
@ -193,6 +194,10 @@ class LanzuMpInfoController extends AdminController
});
}
/**
* @param Content $content
* @return Content
*/
public function showData(Content $content)
{
return $content->header('控制面板')
@ -204,4 +209,5 @@ class LanzuMpInfoController extends AdminController
});
}
}

5
app/Admin/Controllers/LanzuMpWithdrawController.php
View File

@ -4,6 +4,7 @@ namespace App\Admin\Controllers;
use App\Admin\Common\FinancialRecord;
use App\Admin\Common\Sms;
use App\Admin\Common\Type;
use App\Admin\Repositories\LanzuMpWithdraw;
use App\Models\ImsCjdcMarket;
use App\Models\LanzuMpWithdraw as modelMpInfo;
@ -57,6 +58,7 @@ class LanzuMpWithdrawController extends AdminController
});
if ($current_user->isRole('lanzu_mp')) {
$grid->disableEditButton();
$grid->disableActions();
} else {
$grid->disableCreateButton();
}
@ -164,7 +166,7 @@ class LanzuMpWithdrawController extends AdminController
MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money);
} elseif ($form->status == 1) {
//如果审核通过,则记录流水
FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现');
FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, Type::MONEY_TYPE_MP, '服务商提现', '服务商提现');
}
}
});
@ -188,7 +190,6 @@ class LanzuMpWithdrawController extends AdminController
$balance = $mpb->balance;
}
return Form::make(new LanzuMpWithdraw(), function (Form $form) use ($current_user, $balance, $mpb, $mp) {
$form->footer(function ($footer) {
// 去掉`查看`checkbox

1
app/Admin/Controllers/LanzuServiceRewardController.php
View File

@ -88,6 +88,7 @@ class LanzuServiceRewardController extends AdminController
$ssdb->multi_hset('set_reward_' . $form->type, $data);
});
$form->disableViewButton();
$form->disableDeleteButton();
});
}
}

40
app/Admin/Controllers/Type.php
View File

@ -1,40 +0,0 @@
<?php
namespace App\Admin\Controllers;
class Type
{
/**
* 流水类型，大的分类，<100是奖励分账等收入项 >=100是提现消费等支出项
*/
const MONEY_TYPE_CS_PLAT_NEW_USER = 1; // 社区服务点新用户奖励（线上订单完成）
const MONEY_TYPE_CS_FIRST_ORDER = 2; // 社区服务点新用户线上首单奖励（线上订单完成）
const MONEY_TYPE_CS_OL_ORDER = 3; // 社区服务点用户线上订单分账（线上订单完成）
const MONEY_TYPE_STORE_PLAT_NEW_USER = 4; // 商户平台新用户奖励
const MONEY_TYPE_STORE_FIRST_ORDER = 5; // 商户当日首单奖励
const MONEY_TYPE_STORE_OL_ORDER_COMP = 6; // 商户线上订单完成收入
const MONEY_TYPE_STORE_OFL_ORDER_COMP = 7; // 商户线下订单完成收入
const MONEY_TYPE_USER_OL_ORDER_REFUND = 8; // 用户线上订单退款
const MONEY_TYPE_MM_PLAT_NEW_USER = 9; // 市场经理发展新用户
const MONEY_TYPE_MM_PLAT_NEW_STORE = 10; // 市场经理发展新商户
const MONEY_TYPE_MP_PLAT_NEW_USER = 11; // 服务商发展新用户
const MONEY_TYPE_MP_PLAT_NEW_STORE = 12; // 服务商发展新商户
const MONEY_TYPE_MP_OL_ORDER = 13; // 服务商线上订单分账（线上订单完成）
const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单
const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单
/**
* lanzu_user_balance 提现类型
*/
const BALANCE_USER_TYPE_U = 1; //用户提现类型
const BALANCE_USER_TYPE_MP = 2; //服务商提现类型
const BALANCE_USER_TYPE_MM = 3; //市场经理提现类型
const BALANCE_USER_TYPE_CS = 4; //社区提现类型
const BALANCE_USER_TYPE_STORE= 5; //商户提现类型
}

8
app/Admin/Controllers/v3/BannersController.php
View File

@ -92,7 +92,7 @@ class BannersController extends AdminController
$form->select('market_id')->options($marketList)->default(0);
// 多个市场
$form->multipleSelect('market_ids')->options($marketList);
$form->select('type')->options(BannersModel::$_type)->required();
$form->select('type')->options(BannersModel::$_TYPE)->required();
$form->text('title')->required();
$form->text('sub_title');
$form->number('sort')->default(0);
@ -105,10 +105,10 @@ class BannersController extends AdminController
});
});
$form->column(6, function (Form $form) {
$form->image('cover')->required()->uniqueName();
$form->select('cover_type')->options(BannersModel::$_coverType)->required();
$form->image('cover')->autoUpload()->required()->uniqueName();
$form->select('cover_type')->options(BannersModel::$_COVER_TYPE)->required();
$form->text('path')->default('');
$form->select('path_type')->options(BannersModel::$_pathType)->default('');
$form->select('path_type')->options(BannersModel::$_PATH_TYPE)->default('');
});
$form->disableResetButton();

4
app/Admin/Controllers/v3/CategoryController.php
View File

@ -11,7 +11,7 @@ use Dcat\Admin\Tree;
use Dcat\Admin\Controllers\AdminController;
use Dcat\Admin\Show;
use Dcat\Admin\Widgets\Card;
use App\Admin\Forms\CategoryTieForm;
use App\Admin\Forms\v3\CategoryTieForm;
use App\Libs\SsdbClient;
class CategoryController extends AdminController
@ -53,7 +53,7 @@ class CategoryController extends AdminController
$form->select('parent_id')->default(0)->options($parentList);
$form->text('title')->required();
$form->image('cover_img')->required()->uniqueName();
$form->image('cover_img')->autoUpload()->required()->uniqueName();
$form->number('sort');

8
app/Admin/Controllers/v3/GoodsActivityController.php
View File

@ -142,8 +142,8 @@ class GoodsActivityController extends AdminController
$form->select('goods_category_id');
$form->select('store_id')->required()->options($storeList);
$form->text('name')->required()->maxLength(20);
$form->image('cover_img')->required()->uniqueName();
$form->select('type')->options(GoodsActivityModel::$_type)->default('flash_sale');
$form->image('cover_img')->autoUpload()->required();
$form->select('type')->options(GoodsActivityModel::$_TYPE)->default('flash_sale');
$form->datetime('expire_time')->required()->format('YYYY-MM-DD HH:mm:ss')->help($form->model()->expire_time_text);
});
$form->column(6, function (Form $form) {
@ -161,13 +161,13 @@ class GoodsActivityController extends AdminController
});
$form->column(12, function (Form $form) {
$form->hasMany('image_banners', function (Form\NestedForm $form) {
$form->image('path')->width(2)->uniqueName();
$form->image('path')->autoUpload()->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(1)->default(1);
})->required();
$form->divider();
$form->hasMany('video_banners', function (Form\NestedForm $form) {
$form->file('path')->width(2)->uniqueName();
$form->file('path')->autoUpload()->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(2)->default(2);
});

2
app/Admin/Controllers/v3/GoodsCategoryController.php
View File

@ -75,7 +75,7 @@ class GoodsCategoryController extends AdminController
$category = CategoryModel::getArray([['parent_id','>',0]]);
$form->select('category_id')->width(4)->required()->options($category);
$form->text('title')->width(4)->required();
$form->image('cover_img')->width(2)->uniqueName();
$form->image('cover_img')->autoUpload()->width(2)->uniqueName();
$form->number('sort');
$form->disableResetButton();

18
app/Admin/Controllers/v3/GoodsController.php
View File

@ -2,7 +2,7 @@
namespace App\Admin\Controllers\v3;
use App\Admin\Actions\Grid\GoodsCopy;
use App\Admin\Actions\Grid\v3\GoodsCopy;
use App\Admin\Repositories\v3\Goods;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
@ -12,9 +12,7 @@ use App\Models\v3\Category as CategoryModel;
use App\Models\v3\Store as StoreModel;
use Dcat\Admin\Form\NestedForm;
use App\Models\v3\Goods as GoodsModel;
use App\Models\v3\GoodsBanners as GoodsBannersModel;
use App\Models\v3\Market as MarketModel;
use Dcat\Admin\Grid\Displayers\Actions;
use App\Models\v3\GoodsCategory as GoodsCategoryModel;
class GoodsController extends AdminController
@ -113,7 +111,9 @@ class GoodsController extends AdminController
$text = '';
if($value){
foreach ($value as $v){
$text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】 ';
$specKey = isset($v['spec_key'])?$v['spec_key']:'';
$specValue = isset($v['spec_value'])?$v['spec_value']:'';
$text .= '【'.$specKey .'：'.$specValue.'】 ';
}
}
return $text;
@ -167,7 +167,7 @@ class GoodsController extends AdminController
$form->select('goods_category_id')->required();
$form->select('store_id')->required()->options($storeList);
$form->text('name')->required()->maxLength(20);
$form->image('cover_img')->required()->uniqueName();
$form->image('cover_img')->autoUpload()->required();
$form->number('sort');
});
$form->column(6, function (Form $form) {
@ -182,13 +182,13 @@ class GoodsController extends AdminController
});
$form->column(12, function (Form $form) {
$form->hasMany('image_banners', function (Form\NestedForm $form) {
$form->image('path')->required()->width(2)->uniqueName();
$form->image('path')->autoUpload()->required()->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(1)->default(1);
})->required();
$form->divider();
$form->hasMany('video_banners', function (Form\NestedForm $form) {
$form->file('path')->width(2);
$form->file('path')->autoUpload()->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(2)->default(2);
});
@ -200,8 +200,8 @@ class GoodsController extends AdminController
$form->tags('tags','标签')->options(['新品','热销','新鲜']);
$form->table('spec', function (NestedForm $table) {
$table->text('spec_key')->help('如：净含量：500克，保质期：120天，包装：12个/盒等');
$table->text('spec_value');
$table->text('spec_key')->required()->help('如：净含量：500克，保质期：120天，包装：12个/盒等');
$table->text('spec_value')->required();
});
$form->switch('on_sale')
->customFormat(function ($v) {

43
app/Admin/Controllers/v3/GoodsNewController.php
View File

@ -41,6 +41,18 @@ class GoodsNewController extends AdminController
$grid->name->editable();
$grid->price->editable();
$grid->column('goods_unit','单位')->editable();
$grid->column('spec','规格')->display(function($spec){
$item = '';
if(!empty($spec)){
foreach($spec as $key => $value){
$specKey = isset($value['spec_key'])?$value['spec_key']:'';
$specValue = isset($value['spec_value'])?$value['spec_value']:'';
$item .= $specKey.'：'.$specValue.'</br>';
}
}
return $item;
});
$grid->column('market_id')->display(function($marketId){
$item = MarketModel::getMarketInfo($marketId,'name');
return empty($item) ? '' : $item->name;
@ -66,14 +78,18 @@ class GoodsNewController extends AdminController
$grid->actions([new GoodsNewCopy(),new GoodsNewImage()]);
$grid->filter(function (Grid\Filter $filter) use($storeList, $categoryList, $goodsCategoryList, $marketList){
$filter->equal('id');
$filter->like('name');
$filter->equal('store_id')->select($storeList);
$filter->equal('category_id')->select($categoryList);
$filter->equal('goods_category_id')->select($goodsCategoryList);
$filter->equal('market_id')->select($marketList);
$filter->equal('on_sale')->select(GoodsModel::$_ONSALE);
$filter->equal('price');
$filter->equal('goods_unit');
});
$grid->model()->orderBy('category_id', 'asc');
$grid->model()->orderBy('goods_category_id', 'asc');
// 每页10条
$grid->paginate(10);
});
@ -129,7 +145,9 @@ class GoodsNewController extends AdminController
$text = '';
if($value){
foreach ($value as $v){
$text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】 ';
$specKey = isset($v['spec_key'])?$v['spec_key']:'';
$specValue = isset($v['spec_value'])?$v['spec_value']:'';
$text .= '【'.$specKey .'：'.$specValue.'】 ';
}
}
return $text;
@ -178,12 +196,12 @@ class GoodsNewController extends AdminController
// $marketList = MarketModel::getMarketArray();
$form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
// $form->hidden('market_id')->default(0);
$form->hidden('market_id')->default(0);
$form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
$form->select('goods_category_id');
$form->select('store_id')->required()->options($storeList);
$form->text('name')->required()->maxLength(20);
$form->image('cover_img')->url('ops/files')->required();
$form->image('cover_img')->autoUpload()->url('ops/files')->required();
$form->number('sort');
});
$form->column(6, function (Form $form) {
@ -198,13 +216,13 @@ class GoodsNewController extends AdminController
});
$form->column(12, function (Form $form) {
$form->hasMany('image_new_banners', function (Form\NestedForm $form) {
$form->image('path')->url('ops/files')->width(2);
$form->image('path')->autoUpload()->url('ops/files')->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(1)->default(1);
})->required();
$form->divider();
$form->hasMany('video_new_banners', function (Form\NestedForm $form) {
$form->file('path')->url('ops/files')->width(2);
$form->file('path')->autoUpload()->url('ops/files')->width(2);
$form->number('sort')->width(2)->default(0);
$form->hidden('type')->value(2)->default(2);
});
@ -216,8 +234,8 @@ class GoodsNewController extends AdminController
$form->tags('tags','标签')->options(['新品','热销','新鲜']);
$form->table('spec', function (NestedForm $table) {
$table->text('spec_key')->help('如：净含量：500克，保质期：120天，包装：12个/盒等');
$table->text('spec_value');
$table->text('spec_key')->required()->help('如：净含量：500克，保质期：120天，包装：12个/盒等');
$table->text('spec_value')->required();
});
$form->switch('on_sale')
->customFormat(function ($v) {
@ -239,10 +257,13 @@ class GoodsNewController extends AdminController
$spec = $form->input('spec');
$detailsImgs = $form->input('details_imgs');
$goodsCategoryId = $form->input('goods_category_id');
// 商品所属市场，根据店铺查询市场
// $info = StoreModel::getStoreInfo($storeId,'market_id');
// $form->market_id = $info->market_id;
if($form->isCreating() && !empty($storeId)){
// 商品所属市场，根据店铺查询市场
$info = StoreModel::getStoreInfo($storeId,'market_id');
$form->market_id = $info->market_id;
}
$tags = $form->input('tags');
if(!empty($tags)){
$tagsArr = [];

154
app/Admin/Controllers/v3/LanzuEmployeesController.php
View File

@ -0,0 +1,154 @@
<?php
namespace App\Admin\Controllers\v3;
use App\Admin\Repositories\v3\LanzuEmployees;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use App\Models\v3\LanzuEmployees as EmployeesModel;
use App\Models\v3\User as UserModel;
use App\Models\v3\Store as StoreModel;
use App\Models\v3\ServicePersonnel as ServicePersonnelModel;
use App\Models\v3\Market as MarketModel;
class LanzuEmployeesController extends AdminController
{
/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
return Grid::make(new LanzuEmployees(), function (Grid $grid) {
//市场
$marketList = MarketModel::getMarketArray();
$positionList = config('role.position');
$grid->column('id')->sortable();
$grid->column('name');
$grid->column('tel');
$grid->column('user_id');
$grid->column('market_id')->display(function($marketId) use($marketList){
return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
});
$grid->column('store_id')->display(function($storeId){
$item = StoreModel::getStoreInfo($storeId,'name');
return empty($item) ? '' : $item->name;
});
$grid->column('position')->display(function($position) use($positionList){
$item = '';
if(!empty($position) && is_array($position)){
foreach($position as $key => $value){
$item .= '【'.$positionList[$value].'】';
}
}
return $item;
});
$grid->column('status')->width(3)->select(EmployeesModel::$_STATUS);
$grid->filter(function (Grid\Filter $filter) use($marketList,$positionList){
$filter->equal('id');
$filter->equal('market_id')->select($marketList);
$filter->like('position')->select($positionList);
});
$grid->model()->orderBy('status','desc');
$grid->model()->orderBy('id','desc');
// 每页10条
$grid->paginate(10);
});
}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new LanzuEmployees(), function (Show $show) {
$show->field('id');
$show->field('name');
$show->field('tel');
$show->field('user_id');
$show->field('store_id')->as(function($storeId){
$item = StoreModel::getStoreInfo($storeId,'name');
return empty($item) ? '' : $item->name;
});
$show->field('market_id')->as(function($marketId){
$item = MarketModel::getMarketInfo($marketId,'name');
return empty($item) ? '' : $item->name;
});
$show->field('position')->as(function($position){
$positionList = config('role.position');
$item = '';
if(!empty($position) && is_array($position)){
foreach($position as $key => $value){
$item .= ' 【'.$positionList[$value].'】';
}
}
return $item;
});
$show->field('status_text');
$show->field('note');
$show->field('created_at');
$show->field('updated_at');
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(new LanzuEmployees(), function (Form $form) {
$userId = $form->model()->user_id;
//市场
$marketList = MarketModel::getMarketArray();
//店铺
$storeList = StoreModel::getStoreArray([['market_id','=',1]]);
// 用户
// $userList = UserModel::getUserArray();
// 已绑定的用户
// $userHas = EmployeesModel::pluck('user_id')->toArray();
// foreach($userList as $ku => $uv){
// if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){
// unset($userList[$ku]);
// }
// }
$form->hidden('id');
$form->number('user_id')->required()->min(0);
// $form->select('user_id')->required()->options($userList);
$form->text('name','真实姓名')->width(2)->required();
$form->mobile('tel')->width(4)->required();
$form->select('market_id')->required()->options($marketList);
$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();
$userId = $form->input('user_id');
$store = EmployeesModel::select('id')->where([
['user_id','=',$userId],
['id','<>',$id?$id:0],
])->first();
if(!empty($store)){
return $form->error('用户已经为懒族员工');
}
});
$form->disableResetButton();
$form->disableViewCheck();
$form->disableEditingCheck();
$form->disableCreatingCheck();
});
}
}

150
app/Admin/Controllers/v3/ServicePersonnelController.php
View File

@ -7,6 +7,10 @@ use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use App\Models\v3\ServicePersonnel as ServicePersonnelModel;
use App\Models\v3\Market as MarketModel;
use App\Models\v3\User as UserModel;
use App\Admin\Common\WeChatQrCode;
class ServicePersonnelController extends AdminController
{
@ -18,22 +22,32 @@ class ServicePersonnelController extends AdminController
protected function grid()
{
return Grid::make(new ServicePersonnel(), function (Grid $grid) {
//市场
$marketList = MarketModel::getMarketArray();
$grid->column('id')->sortable();
$grid->column('user_id');
$grid->column('head_url')->image('',50);
$grid->column('name');
$grid->column('tel');
$grid->column('market_id');
$grid->column('type');
$grid->column('status');
$grid->column('qr_url');
$grid->column('head_url');
$grid->column('created_at');
$grid->column('updated_at')->sortable();
$grid->filter(function (Grid\Filter $filter) {
$grid->column('market_id')->display(function($marketId) use ($marketList){
return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
});
$grid->column('type_text');
$grid->column('qr_url')->image('',50);
$grid->column('status')->using(ServicePersonnelModel::$_STATUS)->label(config('label.status_label'));
$grid->model()->orderby('id','desc');
$grid->filter(function (Grid\Filter $filter) use($marketList){
$filter->equal('id');
$filter->like('name');
$filter->equal('type')->select(ServicePersonnelModel::$_TYPE);
$filter->equal('market_id')->select($marketList);
});
// 每页10条
$grid->paginate(10);
// $grid->disableDeleteButton();
});
}
@ -47,17 +61,33 @@ class ServicePersonnelController extends AdminController
protected function detail($id)
{
return Show::make($id, new ServicePersonnel(), function (Show $show) {
$show->field('id');
$show->field('user_id');
$show->field('name');
$show->field('tel');
$show->field('market_id');
$show->field('type');
$show->field('status');
$show->field('qr_url');
$show->field('head_url');
$show->field('created_at');
$show->field('updated_at');
$show->row(function (Show\Row $show) {
$show->width(6)->id;
$show->width(6)->field('name');
$show->width(6)->field('tel');
$show->width(6)->field('user_id')->as(function($userId){
$item = UserModel::getUserInfo($userId,'nick_name');
return empty($item) ? '' : '【'.$userId.'】：' . $item['nick_name'];
});
$show->width(6)->field('head_url')->image();
$show->width(6)->field('qr_url')->image();
});
$show->row(function (Show\Row $show) {
$show->width(6)->field('market_id')->as(function($marketId){
$item = MarketModel::getMarketInfo($marketId,'name');
return empty($item) ? '' : $item['name'];
});
$show->width(6)->field('type_text');
$show->width(6)->field('status_text');
$show->width(6)->field('created_at')->as(function($createdAt){
return date('Y-m-d H:i:s',$createdAt);
});
$show->width(6)->field('updated_at')->as(function($updatedAt){
return date('Y-m-d H:i:s',$updatedAt);
});
});
});
}
@ -69,18 +99,70 @@ class ServicePersonnelController extends AdminController
protected function form()
{
return Form::make(new ServicePersonnel(), function (Form $form) {
$form->display('id');
$form->text('user_id');
$form->text('name');
$form->text('tel');
$form->text('market_id');
$form->text('type');
$form->text('status');
$form->text('qr_url');
$form->text('head_url');
$form->display('created_at');
$form->display('updated_at');
$userId = $form->model()->user_id;
//市场
$marketList = MarketModel::getMarketArray();
// 用户
// $userList = UserModel::getUserArray();
// 已绑定的用户
// $userHas = ServicePersonnelModel::pluck('user_id')->toArray();
// foreach($userList as $ku => $uv){
// if($ku != 0 && in_array($ku,$userHas) && !in_array($userId,$userHas)){
// unset($userList[$ku]);
// }
// }
$form->column(6,function(Form $form){
$form->hidden('id');
$form->text('name')->required();
$form->mobile('tel')->required();
$form->image('head_url')->autoUpload();
});
$form->column(6,function(Form $form) use($marketList){
$form->select('type')->options(ServicePersonnelModel::$_TYPE)->required();
$form->select('market_id')->options($marketList)->required();
// $form->select('user_id')->options($userList)->required();
$form->number('user_id')->required()->min(0);
$statusList = ServicePersonnelModel::$_STATUS;
unset($statusList[0],$statusList[2]);
$form->radio('status')->options($statusList)->default(1);
});
$form->saving(function(Form $form){
$id = $form->getKey();
$userId = $form->input('user_id');
if(!empty($id) && !empty($userId)){
$user = UserModel::getUserInfo($userId,'id');
if(empty($user)){
return $form->error('懒ID不存在');
}
$store = ServicePersonnelModel::select('id')->where([
['user_id','=',$userId],
['id','<>',$id?$id:0],
])->first();
if(!empty($store)){
return $form->error('用户已经为服务专员');
}
}
});
$form->saved(function(Form $form){
$id = $form->getKey();
if($form->isCreating() && !empty($id)){
$model = ServicePersonnelModel::find($id);
$qrCode = new WeChatQrCode();
// 生成专员二维码
$qrCodeImg = $qrCode->getServicePersonnel($id);
if($qrCodeImg['status']){
$model->qr_url = $qrCodeImg['path'];
$model->save();
}
}
});
$form->disableResetButton();
$form->disableViewCheck();
$form->disableEditingCheck();
$form->disableCreatingCheck();
});
}
}

129
app/Admin/Controllers/v3/StoreController.php
View File

@ -11,7 +11,7 @@ use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use App\Models\LanzuMmInfo as MminfoModel;
use App\Models\v3\Market as MarketModel;
use App\Admin\Common\StoreQRCode;
use App\Admin\Common\StoreQrCode;
use App\Models\v3\Store as StoreModel;
use App\Models\v3\User as UserModel;
use App\Models\v3\Category as CategoryModel;
@ -36,21 +36,42 @@ class StoreController extends AdminController
$builder = StoreModel::where(['mm_user_id' => $mm->user_id]);
}
return Grid::make($builder, function (Grid $grid) {
// 查询市场
$marketList = MarketModel::getMarketArray();
// 查询一级分类
// $categoryList = CategoryModel::getArray([['parent_id','=',0]]);
$grid->model()->orderBy('id','desc');
$grid->id->sortable();
$grid->logo_url->image('',50);
$grid->name;
$grid->market_id->display(function ($marketId){
$market = MarketModel::getMarketInfo($marketId,'name');
return empty($market) ? '' : $market->name;
$grid->market_id->display(function ($marketId) use($marketList){
// $market = MarketModel::getMarketInfo($marketId,'name');
return isset($marketList[$marketId]) ? $marketList[$marketId] : '';
});
$grid->mm_user_id->display(function ($mmUserId){
$mmUser = MminfoModel::getMmInfo($mmUserId,'name');
return empty($mmUser) ? '' : $mmUser->name;
});
$grid->store_applet_img->image('',50);
$grid->cash_code_img->image('',50);
$grid->store_applet_img->display(function($appletImg){
$id = $this->id;
$oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_store_img/wx_store_'.$id.'.jpg';
$path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg;
$img = "<img src='$path' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
return $img;
});
// ->image('',50);
$grid->cash_code_img->display(function($appletImg){
$id = $this->id;
$oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize');
$path = empty($appletImg) ? $oldPath : config('filesystems.disks.oss.img_host').'/'.$appletImg;
$img = "<img src='$path' data-action='preview-img' style='max-width:50px;max-height:200px;cursor:pointer' class='img img-thumbnail'/>";
return $img;
});
// ->image('',50);
$grid->sort->sortable();
$grid->is_rest->switch();
@ -58,13 +79,17 @@ class StoreController extends AdminController
$grid->actions([new StoreSetTime()]);
// 搜索
$grid->filter(function (Grid\Filter $filter) {
$grid->filter(function (Grid\Filter $filter) use($marketList){
$filter->equal('id');
$filter->like('name');
$filter->equal('market_id')->select($marketList);
});
// 每页10条
$grid->paginate(10);
$grid->disableDeleteButton();
});
}
@ -89,10 +114,6 @@ class StoreController extends AdminController
$item = MarketModel::getMarketInfo($marketId,'name');
return empty($item) ? '' : $item->name;
});
$show->width(6)->category_id->as(function ($categoryId){
$item = CategoryModel::getInfo($categoryId,'title');
return empty($item) ? '' : $item->title;
});
$show->width(6)->name;
$show->width(6)->logo->image();
$show->width(6)->user_id->as(function ($userId){
@ -106,6 +127,13 @@ class StoreController extends AdminController
$show->width(6)->business_license->image();
$show->width(6)->zm_img->image();
$show->width(6)->fm_img->image();
$show->store_applet_img->width(6)->image();
$show->cash_code_img->width(6)->image();
$show->width(6)->category_id->as(function ($categoryId){
$item = CategoryModel::getInfo($categoryId,'title');
return empty($item) ? '' : $item->title;
});
$show->width(6)->tel;
$show->width(6)->link_name;
$show->width(6)->link_tel;
@ -127,8 +155,11 @@ class StoreController extends AdminController
$show->width(6)->loudspeaker_imei;
});
// $show->created_at;
// $show->updated_at;
$show->panel()->tools(function ($tools) {
$tools->disableDelete();
});
});
}
@ -140,6 +171,8 @@ class StoreController extends AdminController
protected function form()
{
return Form::make(new Store(), function (Form $form) {
// $userId = $form->model()->user_id;
$adminId = $form->model()->admin_id;
// 查询市场经理
// $mmList = MminfoModel::getMmInfoArray();
// 查询市场
@ -147,15 +180,15 @@ class StoreController extends AdminController
// 查询一级分类
$categoryList = CategoryModel::getArray([['parent_id','=',0]]);
// 用户
$userList = UserModel::getUserArray();
// 绑定了店铺的用户
$userHas = StoreModel::pluck('admin_id')->toArray();
// $userList = UserModel::getUserArray();
// 已绑定店铺的用户
// $userHas = StoreModel::pluck('admin_id')->toArray();
foreach($userList as $ku => $uv){
if($ku != 0 && in_array($ku,$userHas)){
unset($userList[$ku]);
}
}
// foreach($userList as $ku => $uv){
// if($ku != 0 && in_array($ku,$userHas) && !in_array($adminId,$userHas)){
// unset($userList[$ku]);
// }
// }
$form->column(6, function (Form $form) use($marketList,$categoryList){
$form->hidden('id');
@ -163,7 +196,7 @@ class StoreController extends AdminController
$form->select('market_id')->required()->options($marketList);
$form->select('category_id')->options($categoryList);
$form->text('name')->required()->maxLength(50);
$form->image('logo')->required()->uniqueName();
$form->image('logo')->autoUpload()->required();
$form->mobile('tel');
$form->text('link_name')->required();
$form->mobile('link_tel')->required();
@ -182,16 +215,18 @@ class StoreController extends AdminController
->saving(function ($v) {
return $v == 1 ? 1 : 0;
});
$form->text('address');
$form->text('address')->required();
});
$form->column(6, function (Form $form) use($userList){
$form->image('business_license')->required()->uniqueName();
$form->image('zm_img')->required()->uniqueName();
$form->image('fm_img')->required()->uniqueName();
$form->select('admin_id')->options($userList)->required();
$form->select('user_id')->options($userList)->required();
$form->time('time1','时间段一开始')->format('HH:mm');
$form->time('time2','时间段一结束')->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']);
$form->column(6, function (Form $form) {
$form->image('business_license')->autoUpload()->required();
$form->image('zm_img')->autoUpload()->required();
$form->image('fm_img')->autoUpload()->required();
// $form->select('admin_id')->options($userList)->required();
// $form->select('user_id')->options($userList)->required();
$form->number('admin_id')->required()->min(0);
$form->number('user_id')->required()->min(0);
$form->time('time1','时间段一开始')->required()->format('HH:mm');
$form->time('time2','时间段一结束')->required()->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']);
$form->time('time3','时间段二开始')->format('HH:mm')->rules('after:time2',['after'=>'选择的时间必须比时间段一结束时间晚']);
$form->time('time4','时间段二结束')->format('HH:mm')->rules('after:time3',['after'=>'选择的时间必须比时间段二开始时间晚']);
// $form->timeRange('time1','time2','营业时间段一')->required();
@ -200,14 +235,31 @@ class StoreController extends AdminController
$form->column(12, function (Form $form) {
$form->map('lat','lng','地址');
$form->textarea('introduction')->required();
$form->textarea('announcement');
$form->multipleImage('environment');
$form->textarea('announcement')->default('');
$form->multipleImage('environment')->autoUpload()->default('');
});
// $form->text('coordinates')->width(4)
// ->placeholder('输入 经纬度,如: 108.281552,22.83731')
// ->help("通过网址 <a href='https://lbs.amap.com/console/show/picker' target='_blank'>https://lbs.amap.com/console/show/picker</a> 获取经纬度");
$form->saving(function(Form $form){
$id = $form->getKey();
$adminId = $form->input('admin_id');
if(!empty($id) && !empty($adminId)){
$user = UserModel::getUserInfo($adminId,'id');
if(empty($user)){
return $form->error('管理员不存在');
}
$store = StoreModel::select('id')->where([
['admin_id','=',$adminId],
['id','<>',$id?$id:0],
])->first();
if(!empty($store)){
return $form->error('管理员已经绑定了店铺');
}
}
});
$form->saved(function (Form $form){
$id = $form->getKey();
$store = StoreModel::find($id);
@ -226,7 +278,7 @@ class StoreController extends AdminController
}
if($form->isCreating() && !empty($id)){
$qrCode = new StoreQRCode();
$qrCode = new StoreQrCode();
// 生成小程序码 店铺
$sRes = $qrCode->SetStoreWeChatCode($id);
@ -235,10 +287,10 @@ class StoreController extends AdminController
// 保存图片
$store->store_applet_img = $sRes['status'] ? $sRes['path'] : '';
$store->cash_code_img = $pRes['status'] ? $pRes['path'] : '';
$cashImg = $pRes['status'] ? $pRes['path'] : '';
// 保存剪裁图片
$store->cash_code_img = $cashImg.config('filesystems.disks.oss.store_image_resize');
$store->save();
// 剪裁图片
// $form->image('cash_code_img')->crop(270, 270, [5, 5])->uniqueName();
//店长账号
$storeUsersInfo = StoreUsersModel::where('store_id',$id)->where('user_category',1)->first();
@ -262,6 +314,7 @@ class StoreController extends AdminController
$form->disableViewCheck();
$form->disableEditingCheck();
$form->disableCreatingCheck();
$form->disableDeleteButton();
});
}

113
app/Admin/Controllers/v3/UserController.php
View File

@ -0,0 +1,113 @@
<?php
namespace App\Admin\Controllers\v3;
use App\Admin\Repositories\v3\User;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController;
use App\Models\v3\User as UserModel;
class UserController extends AdminController
{
/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
return Grid::make(new User(), function (Grid $grid) {
$grid->column('id')->sortable();
$grid->column('avatar')->image('',50);
$grid->column('nick_name');
$grid->column('openid');
$grid->column('unionid');
$grid->column('real_name')->editable();
$grid->column('tel');
$grid->column('gender_text');
$grid->column('status')->using(UserModel::$_STATUS)->label(config('label.status_label'));
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
$filter->like('nick_name');
$filter->like('real_name');
});
$grid->model()->orderBy('id','desc');
// 每页10条
$grid->paginate(10);
$grid->disableCreateButton();
$grid->disableDeleteButton();
$grid->disableEditButton();
});
}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new User(), function (Show $show) {
$show->field('id');
$show->field('nick_name');
$show->field('avatar')->image();
$show->field('openid');
$show->field('real_name');
$show->field('tel');
$show->field('unionid');
$show->field('country');
$show->field('province');
$show->field('city');
$show->field('gender_text');
$show->field('language');
$show->field('status_text');
$show->field('created_at');
$show->field('updated_at');
$show->panel()->tools(function ($tools) {
$tools->disableEdit();
// $tools->disableList();
$tools->disableDelete();
// 显示快捷编辑按钮
// $tools->showQuickEdit();
});
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(new User(), function (Form $form) {
$form->hidden('id');
$form->text('nick_name');
$form->image('avatar');
$form->text('openid');
$form->text('real_name');
$form->tel('tel');
$form->text('unionid');
$form->text('status');
$form->text('country');
$form->text('province');
$form->text('city');
$form->radio('gender')->options(UserModel::$_GENDER);
$form->text('language');
$form->disableResetButton();
$form->disableViewCheck();
$form->disableEditingCheck();
$form->disableCreatingCheck();
$form->disableDeleteButton();
});
}
}

8
app/Admin/Extensions/CheckRow.php
View File

@ -1,13 +1,11 @@
<?php
namespace App\Admin\Extensions;
use App\Admin\Forms\CouponTieForm;
use App\Admin\Forms\SelectHorseman;
use App\Models\ImsCjdcOrderMain;
use App\Models\StoreAccount;
use Dcat\Admin\Grid\RowAction;
use Dcat\Admin\Widgets\Modal;
use Illuminate\Http\Request;
class CheckRow extends RowAction
{
@ -30,7 +28,7 @@ class CheckRow extends RowAction
$form = SelectHorseman::make(['order_id'=>$this->order_id,'current_page'=>$this->currentPage]);
return Modal::make()
->lg()
->title($this->title)
->title('选择配送员')
->body($form)
->button($this->title);

2
app/Admin/Extensions/MyDetailPage.php
View File

@ -55,7 +55,7 @@ class MyDetailPage extends LazyRenderable
coupon_money: "{$order['coupon_money']}",
delivery_money: "{$order['delivery_money']}",
horseman_name: "{$order['horseman_name']}",
distance: "{$order['distance']}",
distance: "{$order['delivery_distance']}",
orders: JSON.parse(orders),
show_refund: JSON.parse(show_refund),
refund_2:"退款",

20
app/Admin/Extensions/OrderPrint.php
View File

@ -4,6 +4,7 @@
namespace App\Admin\Extensions;
use App\Admin\Common\Rpc;
use App\Models\Feprint;
use App\Models\ImsCjdcOrderMain;
use Dcat\Admin\Grid\RowAction;
@ -44,7 +45,6 @@ class OrderPrint extends RowAction
public function doPrint($oid)
{
$row = ImsCjdcOrderMain::find($oid);
//>>1.获取打印机状态
@ -52,7 +52,7 @@ class OrderPrint extends RowAction
//>>2.调用打印
if ($result == 1) {
$res = $this->rpcPrint($oid);
$res = Rpc::doPrint($row->global_order_id);
$res = json_decode($res, true)['result'];
$res = json_decode($res);
@ -81,20 +81,4 @@ class OrderPrint extends RowAction
return -1;
}
}
public function rpcPrint($oid)
{
$client = Client::factory(env('RPC_SITE_HOST'));
$request = $client->request(uniqid(), '/feie/doPrint', ['oid' => $oid]);
$response = $client->send($request);
return $response->getBody()->getContents();
}
public function feiErPrint($order_num)
{
include_once app_path('Libs\feier_print\api_php_demo.php');
$result = json_decode(FeiePrint($order_num));
dd($result);
}
}

2
app/Admin/Extensions/OrderStateHandle.php
View File

@ -52,7 +52,7 @@ class OrderStateHandle extends RowAction
Log::error('订单退款接口调用失败',$result);
return $this->response()->error($result['message'])->refresh();
}
//$orderMain->modifyState($id,$state);
$orderMain->modifyState($id,$state);
return $this->response()->success($result['message'])->refresh();
}elseif ($state==3){//接单
$res = $orderMain->modifyState($id,$state);

4
app/Admin/Forms/GoodsNewCopyForm.php
View File

@ -73,10 +73,12 @@ class GoodsNewCopyForm extends Form
];
GoodsBannerModel::insert($banners);
}
}else{
return $this->error('修改失败');
};
}
return $this->success('修改成功', '/goods');
return $this->error('修改成功');
}
/**

2
app/Admin/Forms/RefundNote.php
View File

@ -24,7 +24,7 @@ class RefundNote extends Form
$current_page = request()->get('current_page');
$order = ImsCjdcOrderMain::where('id', $oid)->first();
$order->refuse_refund_note = $note;
$order->state = 10;
$order->state = 2;
$order->updated_at = time();
if ($order->save()) {
$storeIds = ImsCjdcOrder::where('order_main_id',$order->global_order_id)->pluck('store_id')->toArray();

4
app/Admin/Forms/SelectHorseman.php
View File

@ -4,6 +4,7 @@ namespace App\Admin\Forms;
use App\Models\ImsCjdcOrderMain;
use App\Models\LanzuServiceHorseman;
use App\Models\v3\LanzuEmployees;
use Dcat\Admin\Widgets\Form;
use Symfony\Component\HttpFoundation\Response;
@ -36,9 +37,8 @@ class SelectHorseman extends Form
*/
public function form()
{
$this->select('horseman_id','配送员')
->options(LanzuServiceHorseman::getHorseman())
->options(LanzuEmployees::getHorseman())
->required();
$this->hidden('order_id')->value($this->data['order_id']);
$this->hidden('current_page')->value($this->data['current_page']);

2
app/Admin/Forms/CategoryTieForm.php → app/Admin/Forms/v3/CategoryTieForm.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Admin\Forms;
namespace App\Admin\Forms\v3;
use Dcat\Admin\Widgets\Form;
use Symfony\Component\HttpFoundation\Response;

2
app/Admin/Forms/GoodsCopyForm.php → app/Admin/Forms/v3/GoodsCopyForm.php
View File

@ -1,6 +1,6 @@
<?php
namespace App\Admin\Forms;
namespace App\Admin\Forms\v3;
use Dcat\Admin\Widgets\Form;
use Symfony\Component\HttpFoundation\Response;

17
app/Admin/Metrics/Examples/Community/TotalAmount.php
View File

@ -3,6 +3,8 @@
namespace App\Admin\Metrics\Examples\Community;
use App\Models\LanzuUserBalance;
use Dcat\Admin\Admin;
use Dcat\Admin\Support\Helper;
use Dcat\Admin\Widgets\Metrics\Card;
class TotalAmount extends Card
@ -21,7 +23,6 @@ class TotalAmount extends Card
{
parent::init();
$this->content(LanzuUserBalance::getBalance($this->uid, $this->uType));
}
/**
@ -30,11 +31,23 @@ class TotalAmount extends Card
*/
public function renderContent()
{
$content = parent::renderContent();
$adu = Admin::user();
$url = "";
if ($adu->isRole('lanzu_mp')){
$url = url('admin/mp_withdraw/create');
}elseif ($adu->isRole('lanzu_cs')){
$url = url('admin/cs_withdraw/create');
}elseif ($adu->isRole('lanzu_mm')){
$url = url('admin/mm_withdraw/create');
}
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
<a type="button" href="{$url}" style="float: right; margin-right: 10px;margin-top: 15px" class="btn btn-outline-primary">提现</a>
HTML;
}

2
app/Admin/Metrics/Examples/Community/TotalCommunity.php
View File

@ -25,7 +25,7 @@ class TotalCommunity extends Card
{
$content = parent::renderContent();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
HTML;

4
app/Admin/Metrics/Examples/Community/TotalUser.php
View File

@ -13,7 +13,7 @@ class TotalUser extends Card
protected function init()
{
parent::init();
$this->title = '绑定用户数';
$this->title = '社区绑定用户数';
$adu = Admin::user();
if ($adu->isRole('lanzu_cs')){
$this->content(LanzuUserRelationBind::getCount($adu->id));
@ -27,7 +27,7 @@ class TotalUser extends Card
{
$content = parent::renderContent();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
HTML;

27
app/Admin/Metrics/Examples/Order/OrderData.php
View File

@ -7,15 +7,18 @@ use App\Models\ImsCjdcOrder;
use App\Models\ImsCjdcOrderMain;
use Dcat\Admin\Widgets\Metrics\Card;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class OrderData extends Card
{
protected $title;
protected $data_type;
public function __construct($data_type=null,$title = null, $icon = null)
protected $market_id;
public function __construct($data_type=null,$market_id=null,$title = null, $icon = null)
{
$this->title = $title;
$this->data_type = $data_type;
$this->market_id = $market_id;
parent::__construct($title, $icon);
}
@ -36,16 +39,21 @@ class OrderData extends Card
{
$type = $request->get('option');//数据选项
$data_type = $request->get('data_type');//数据类型
$this->content($this->orderNum($data_type,$type));
$market_id = $request->get('market_id');//市场id
$this->content($this->orderNum($data_type,$type,$market_id));
}
public function orderDataBuild($marketId=null,$type=null)
public function orderDataBuild($type=null,$marketId=null)
{
$where = [];
$where['type'] = 1;
if ($marketId){
$where['market_id'] = $marketId;
if (is_array($marketId)){
$where[] = ['in'=>['market_id'=>$marketId]];
}else{
$where['market_id'] = $marketId;
}
}
switch ($type){
@ -82,9 +90,9 @@ class OrderData extends Card
}
public function orderNum($data_type,$type)
public function orderNum($data_type,$type,$marketId)
{
$build = $this->orderDataBuild($marketId=null,$type);
$build = $this->orderDataBuild($type,$marketId);
if ($data_type=='number'){
$result = $build->count();
}elseif ($data_type=='amount'){
@ -100,7 +108,8 @@ class OrderData extends Card
public function parameters() : array
{
return [
'data_type'=>$this->data_type
'data_type'=>$this->data_type,
'market_id'=>$this->market_id,
];
}
@ -112,7 +121,7 @@ class OrderData extends Card
{
$content = parent::renderContent();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
HTML;

4
app/Admin/Metrics/Examples/ServiceCard/TotalMp.php
View File

@ -12,7 +12,7 @@ class TotalMp extends Card
protected function init()
{
parent::init();
$this->title = '服务商量数';
$this->title = '服务商总数';
$this->content(LanzuMpInfo::count());
}
@ -24,7 +24,7 @@ class TotalMp extends Card
{
$content = parent::renderContent();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
HTML;

96
app/Admin/Metrics/Examples/ServiceCard/TotalStore.php
View File

@ -9,34 +9,104 @@ use App\Models\LanzuMmInfo;
use App\Models\LanzuStore;
use Dcat\Admin\Admin;
use Dcat\Admin\Widgets\Metrics\Card;
use Illuminate\Http\Request;
class TotalStore extends Card
{
protected $title;
protected $market_id;
public function __construct($market_id=null,$title = null, $icon = null)
{
$this->title = $title;
$this->market_id = $market_id;
parent::__construct($title, $icon);
}
protected function init()
{
parent::init();
$this->title = '商户数';
$aud = Admin::user();
$count = 0;
if ($aud->isRole('lanzu_mm')){
$mm = LanzuMmInfo::where('admin_user_id',$aud->id)->first();
if ($mm){
$count = ImsCjdcStore::where('mm_user_id',$mm->user_id)->count();
$this->dropdown([
'0'=>'全部',
'1'=>'今日新增',
'-1'=>'昨日新增',
'7'=>'过去一周新增',
'30'=>'本月新增',
'-30'=>'上月新增'
]);
}
public function handle(Request $request)
{
$type = $request->get('option');//数据选项
$market_id = $request->get('market_id');//市场id
$this->content($this->storeNum($type,$market_id));
}
public function storeBuild($type=null,$marketId=null)
{
$where = ['status'=>2];
if ($marketId){
if (is_array($marketId)){
$where[] = ['in'=>['market_id'=>$marketId]];
}else{
$where['market_id'] = $marketId;
}
}elseif($aud->isRole('lanzu_mp')){
$count = 0;
}else{
$count = ImsCjdcStore::count();
}
$this->content($count);
switch ($type){
case '1':
$beginTime=mktime(0,0,0,date('m'),date('d'),date('Y'));
$endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
break;
case '-1':
$beginTime=mktime(0,0,0,date('m'),date('d')-1,date('Y'));
$endTime=mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
break;
case '7':
$beginTime=mktime(0,0,0,date('m'),date('d')-7,date('Y'));
$endTime=mktime(0,0,0,date('m'),date('d')+1,date('Y'))-1;
break;
case '30':
$beginTime=mktime(0,0,0,date('m'),1,date('Y'));
$endTime=mktime(23,59,59,date('m'),date('t'),date('Y'));
break;
case '-30':
$beginTime=mktime(0,0,0,date('m')-1,1,date('Y'));
$endTime=strtotime(date("Y-m-d H:i:s",mktime(23,59,59,date("m") ,0,date("Y"))));
break;
default:
$beginTime=0;
$endTime=999999999999999;
break;
}
$build = LanzuStore
::whereBetween('created_at',[$beginTime,$endTime])
->where($where);
return $build;
}
public function storeNum($type,$marketId)
{
$build = $this->storeBuild($type,$marketId);
$result = $build->count();
return $result;
}
// 传递自定义参数到 handle 方法
public function parameters() : array
{
return [
'market_id'=>$this->market_id,
];
}
public function renderContent()
{
$content = parent::renderContent();
return <<<HTML
<div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
<div class="d-flex justify-content-between bg-primary align-items-center mt-1" style="margin-bottom: 2px">
<h2 class="ml-1 font-large-1">{$content}</h2>
</div>
HTML;

16
app/Admin/Repositories/LanzuAdminUserMarket.php
View File

@ -0,0 +1,16 @@
<?php
namespace App\Admin\Repositories;
use App\Models\LanzuAdminUserMarket as Model;
use Dcat\Admin\Repositories\EloquentRepository;
class LanzuAdminUserMarket extends EloquentRepository
{
/**
* Model.
*
* @var string
*/
protected $eloquentClass = Model::class;
}

2
app/Admin/Repositories/StoreUserReport.php
View File

@ -2,7 +2,7 @@
namespace App\Admin\Repositories;
use App\Models\Store as Model;
use App\Models\v3\Store as Model;
use Dcat\Admin\Grid\Model as GridModel;
use Dcat\Admin\Repositories\EloquentRepository;
use App\Models\StoreAccount as StoreAccountModel;

16
app/Admin/Repositories/v3/LanzuEmployees.php
View File

@ -0,0 +1,16 @@
<?php
namespace App\Admin\Repositories\v3;
use App\Models\v3\LanzuEmployees as Model;
use Dcat\Admin\Repositories\EloquentRepository;
class LanzuEmployees extends EloquentRepository
{
/**
* Model.
*
* @var string
*/
protected $eloquentClass = Model::class;
}

16
app/Admin/Repositories/v3/User.php
View File

@ -0,0 +1,16 @@
<?php
namespace App\Admin\Repositories\v3;
use App\Models\v3\User as Model;
use Dcat\Admin\Repositories\EloquentRepository;
class User extends EloquentRepository
{
/**
* Model.
*
* @var string
*/
protected $eloquentClass = Model::class;
}

15
app/Admin/routes.php
View File

@ -26,6 +26,7 @@ Route::group([
$router->resource('/cs_withdraw', 'LanzuCsWithdrawController');
$router->resource('/service_reward', 'LanzuServiceRewardController');
$router->resource('/financial_record', 'LanzuFinancialRecord');
$router->resource('/admin_user_market', 'LanzuAdminUserMarketController');
$router->any('/mm_list', 'LanzuMmWithdrawController@mmInfoList');
$router->any('/api/getMarket', 'LanzuMmInfoController@getMarket');
@ -61,16 +62,24 @@ Route::group([
// 平台管理
$router->resource('/banners', 'v3\BannersController');
$router->resource('/system_config', 'v3\SystemConfigController');
$router->resource('/order', 'ImsCjdcOrderMainController');
$router->resource('/order', 'ImsCjdcOrderMainController');
$router->any('/detail', 'ImsCjdcOrderMainController@orderDetail');
$router->any('/order_goods_refund', 'ImsCjdcOrderMainController@orderGoodsRefund');
$router->resource('/horseman', 'LanzuServiceHorsemanController');
$router->any('ops/files', 'v3\FileController@handle');
// 服务站专员
// 服务人员
$router->resource('/service_personnel', 'v3\ServicePersonnelController');
$router->resource('/horseman', 'LanzuServiceHorsemanController');
// 懒族员工
$router->resource('/employees', 'v3\LanzuEmployeesController');
$router->resource('/user', 'v3\UserController');
//地区
$router->any('/api/area', 'LanzuArea@getArea');
});

160
app/Console/Commands/MigrateGoods.php
View File

@ -1,160 +0,0 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Schema;
class MigrateGoods extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'migrateData:goods';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command 迁移商品数据';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$oldTableName = 'ims_cjdc_goods_new';
$oldSpecTableName = 'ims_cjdc_spec_combination_new';
$oldStoreTableName = 'ims_cjdc_store_new';
$newTableName = 'lanzu_goods_new';
$newBannerTableName = 'lanzu_goods_banners_new';
// 判断表是否存在
if(!Schema::hasTable($oldTableName)){
var_dump('旧商品表不存在');
return 0;
}
if(!Schema::hasTable($oldSpecTableName)){
var_dump('旧规格表不存在');
return 0;
}
if(!Schema::hasTable($oldStoreTableName)){
var_dump('旧的店铺表不存在');
return 0;
}
if(!Schema::hasTable($newTableName)){
var_dump('新商品表不存在');
return 0;
}
if(!Schema::hasTable($newBannerTableName)){
var_dump('新商品的banners表不存在');
return 0;
}
$oldData = DB::table($oldTableName)->orderBy('id','asc')->get();
$oldStoreData = DB::table($oldStoreTableName)->pluck('market_id','id');
$bar = $this->output->createProgressBar(count($oldData));
$bar->start();
$startTime = time();
$total = 0;
$error = [];
foreach ($oldData as $value){
$goodsId = $value->id;
// 判断店铺是否存在，如果商品的店铺不在，则不存这个商品
$storeExist = DB::table($oldStoreTableName)->where('id',$value->store_id)->exists();
if(!$storeExist){
continue;
}
$goodsData =[
// 'id'=>$value->id,
'market_id' => $oldStoreData[$value->store_id],
'store_id'=>$value->store_id,
'on_sale'=> $value->is_show == 1 ? 1 : 0,
'sort'=>$value->num,
'price'=>$value->money,
'original_price'=>$value->money2,
'vip_price'=>$value->vip_money,
'sales'=>$value->sales,
'start_num'=>$value->start_num,
'restrict_num'=>$value->restrict_num,
'is_infinite'=> $value->is_max == 1 ? 1 :0,
'inventory'=>$value->inventory,
'name'=>$value->name,
'cover_img'=>$value->logo,
'goods_unit'=>$value->good_unit,
'content'=> strip_tags($value->content),
'details'=> strip_tags($value->details),
'created_at' => time(),
'updated_at' => time(),
];
$specs = DB::table($oldSpecTableName)->where('good_id',$goodsId)->get();
if(count($specs) > 0){
foreach($specs as $vs){
$spec = ['spec_key'=>'净含量','spec_value'=>$vs->combination];
if(strstr($vs->combination,'辣')){
$spec['spec_key'] = '口味';
}else if(strstr($vs->combination,'馅')){
$spec['spec_key'] = '馅料';
}else if(strstr($vs->combination,'mm')){
$spec['spec_key'] = '尺寸';
}
$goodsData['spec'] = json_encode([$spec]);
$newData = $goodsData;
$newBanner = [
'type' =>1,
'path' =>$value->logo,
'created_at' =>time(),
'updated_at' =>time(),
];
$id = DB::table($newTableName)->insertGetId($newData);
if(!$id){
$error[] = ['id'=>$goodsId];
break;
}
$newBanner['goods_id'] = $id;
DB::table($newBannerTableName)->insertGetId($newBanner);
$total++;
}
}else{
$newData = $goodsData;
$res= $id = DB::table($newTableName)->insertGetId($newData);
if(!$res){
$error[] = ['id'=>$goodsId];
break;
}
$newBanner['goods_id'] = $id;
DB::table($newBannerTableName)->insertGetId($newBanner);
$total++;
}
$bar->advance();
}
$bar->finish();
var_dump([time()-$startTime]);
var_dump($total);
var_dump($error);
return 0;
}
}

2
app/Console/Commands/MigrateOrderStatistics.php
View File

@ -40,7 +40,7 @@ class MigrateOrderStatistics extends Command
public function handle()
{
$oldTableName = 'ims_cjdc_order_sales_statistics';
$newTableName = 'lanzu_order_sales_statistics_copy';
$newTableName = 'lanzu_order_sales_statistics';
// 判断表是否存在
if(!Schema::hasTable($oldTableName)){
var_dump('旧表不存在');

14
app/Console/Commands/MigrateStore.php
View File

@ -39,10 +39,10 @@ class MigrateStore extends Command
*/
public function handle()
{
$oldTableName = 'ims_cjdc_store_new';
$newTableName = 'lanzu_store_new';
$storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */
$storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */
$oldTableName = 'ims_cjdc_store';
$newTableName = 'lanzu_store';
// $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */
// $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */
// 判断表是否存在
if(!Schema::hasTable($oldTableName)){
var_dump('旧表不存在');
@ -106,10 +106,10 @@ class MigrateStore extends Command
'introduction'=> strip_tags($value->details),
'store_applet_img' => $storeImgPath.$storeId.'.jpg',
'cash_code_img' => $storePayPath.$storeId.'.jpg',
'store_applet_img' => '',
'cash_code_img' => '',
'created_at' => strtotime($value->sq_time),
'created_at' => $value->time_add ?strtotime($value->time_add) : 0,
'updated_at' => time(),
];

16
app/Console/Commands/SetStoreBalance.php
View File

@ -40,8 +40,11 @@ class SetStoreBalance extends Command
*/
public function handle()
{
$oldData = DB::table('ims_cjdc_store')->get();
var_dump('start_time:'.date('H:i:s',time()));
$oldTableName = 'ims_cjdc_store';
$newTableName = 'lanzu_user_balance';
$oldData = DB::table($oldTableName)->get();
$bar = $this->output->createProgressBar(count($oldData));
$bar->start();
@ -49,7 +52,7 @@ class SetStoreBalance extends Command
$newData = [];
foreach ($oldData as $key => $value){
// 查询店铺是否存在balance
$exist = DB::table('lanzu_user_balance')
$exist = DB::table($newTableName)
->where('source_id',$value->id)
->where('user_type',5)
->first();
@ -71,14 +74,15 @@ class SetStoreBalance extends Command
$bar->advance();
}
// 添加到新表
$res = DB::table('lanzu_user_balance')->insert($newData);
$res = DB::table($newTableName)->insert($newData);
$bar->finish();
var_dump(' end_time: '.date('H:i:s',time()));
var_dump('new_total: '.count($newData));
var_dump('exist: '.count($data));
var_dump($data);
var_dump('res: '.$res);
// var_dump($data);
return 0;
}
}

67
app/Console/Commands/SetUserBalanceType.php
View File

@ -0,0 +1,67 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\DB;
class SetUserBalanceType extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'migrateData:setUserBalanceType';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Command 清洗用户余额用户类型字段值，user_type为3洗为4';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
* @return int
*/
public function handle()
{
$oldData = DB::table('lanzu_user_balance')->get();
$bar = $this->output->createProgressBar(count($oldData));
$bar->start();
$total = 0;
$newData = [];
foreach ($oldData as $key => $value){
if($value->user_type == 3){
$newData = [
'user_type' => 4,
'updated_at' => time()
];
if(DB::table('lanzu_user_balance')->where('id',$value->id)->update($newData)){
$total++;
}
}
$bar->advance();
}
$bar->finish();
var_dump('total: '.$total);
return 0;
}
}

10
app/Models/ImsCjdcOrderMain.php
View File

@ -62,12 +62,12 @@ class ImsCjdcOrderMain extends Model
$order['horseman_name'] = LanzuServiceHorseman::getName($order['horseman_id']);
//获取市场经纬度
$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray();
$order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result'];
if ($order['distance']>1000){
$order['distance']= number_format(($order['distance']/1000), 1) .'km';
//$market = LanzuMarket::where('id',$order['market_id'])->first()->toArray();
//$order['distance'] = Rpc::getDistance($market['lng'],$market['lat'],$order['lng'],$order['lat'])['result'];
if ($order['delivery_distance']>1000){
$order['delivery_distance']= number_format(($order['delivery_distance']/1000), 1) .'km';
}else{
$order['distance'].= '米';
$order['delivery_distance'].= '米';
}
return $order;
}

15
app/Models/LanzuAdminUserMarket.php
View File

@ -0,0 +1,15 @@
<?php
namespace App\Models;
use Dcat\Admin\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Model;
class LanzuAdminUserMarket extends Model
{
use HasDateTimeFormatter;
protected $table = 'lanzu_admin_user_market';
protected $dateFormat = 'U';
}

19
app/Models/LanzuArea.php
View File

@ -0,0 +1,19 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class LanzuArea extends Model
{
protected $table = 'lanzu_area';
protected $dateFormat = 'U';
public static function getArea($pid=0)
{
$data = self::where('pid',$pid)->select('id','name as text')->get()->toArray();
return $data;
}
}

14
app/Models/LanzuMpInfo.php
View File

@ -14,4 +14,18 @@ class LanzuMpInfo extends Model
protected $table = 'lanzu_mp_info';
protected $dateFormat = 'U';
/**
* @return array
*/
public static function selectCsInfo()
{
$rows = self::get();
$item = [];
if ($rows){
foreach ($rows as $row){
$item[$row->admin_user_id] = $row->name;
}
}
return $item;
}
}

8
app/Models/LanzuServiceHorseman.php
View File

@ -33,9 +33,11 @@ class LanzuServiceHorseman extends Model
//获取骑手名称
if ($hid){
$horseman = LanzuServiceHorseman::find($hid);
return $horseman->name;
}else{
return '--';
if ($horseman){
return $horseman->name;
}
}
return '--';
}
}

5
app/Models/LanzuUserBalance.php
View File

@ -10,16 +10,15 @@ class LanzuUserBalance extends Model
{
protected $table = 'lanzu_user_balance';
protected $dateFormat = 'U';
protected $guarded = [];
/**
* 获取可提现金额
* @param $uid
* @param $uType 0/1 普通用户/服务商
*/
public static function getBalance($uid, $uType = 0)
public static function getBalance($uid, $uType=null)
{
$row = self::where(['source_id' => $uid, 'user_type' => $uType])->first();
if ($row) {
return $row->balance;
} else {

6
app/Models/MpBalance.php
View File

@ -10,6 +10,7 @@ class MpBalance extends Model
{
protected $table = 'lanzu_user_balance';
protected $dateFormat = 'U';
protected $guarded = [];
/**
* 获取可提现金额
@ -18,7 +19,10 @@ class MpBalance extends Model
*/
public static function getBalance($uid,$uType=0)
{
$row = self::where(['source_id'=>$uid,'user_type'=>$uType])->first();
$row = self::where(['source_id'=>$uid,'user_type'=>$uType])->firstOrCreate(
['source_id'=>$uid,'user_type'=>$uType],
['balance'=>0]
);
if ($row){
return $row->balance;
}else{

18
app/Models/v3/Banners.php
View File

@ -25,10 +25,10 @@ class Banners extends Model
'market_ids'=>'array',
];
public static $_coverType = [1=>'图片', 2=>'视频'];
public static $_pathType = ['page'=>'page','webview'=>'webview','applet'=>'applet'];
public static $_type = [1=>'首页'];
public static $_status = ['禁用', '正常'];
public static $_COVER_TYPE = [1=>'图片', 2=>'视频'];
public static $_PATH_TYPE = ['page'=>'page','webview'=>'webview','applet'=>'applet'];
public static $_TYPE = [1=>'首页'];
public static $_STATUS = ['禁用', '正常'];
public function getCoverUrlAttribute($value)
{
@ -39,22 +39,22 @@ class Banners extends Model
public function getCoverTypeTextAttribute($value)
{
$value = $value ? $value : $this->cover_type;
return isset(self::$_coverType[$value]) ? self::$_coverType[$value] : '';
return isset(self::$_COVER_TYPE[$value]) ? self::$_COVER_TYPE[$value] : '';
}
public function getPathTypeTextAttribute($value)
{
$value = $value ? $value : $this->path_type;
return isset(self::$_pathType[$value]) ? self::$_pathType[$value] : '';
return isset(self::$_PATH_TYPE[$value]) ? self::$_PATH_TYPE[$value] : '';
}
public function getTypeTextAttribute($value)
{
$value = $value ? $value : $this->type;
return isset(self::$_type[$value]) ? self::$_type[$value] : '';
return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : '';
}
public function getStatusTextAttribute($value)
{
$value = $value ? $value : $this->stauts;
return isset(self::$_status[$value]) ? self::$_status[$value] : '';
return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
}
/**
* 处理旧图片
@ -64,7 +64,7 @@ class Banners extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

2
app/Models/v3/Category.php
View File

@ -73,7 +73,7 @@ class Category extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

10
app/Models/v3/Goods.php
View File

@ -27,8 +27,8 @@ class Goods extends Model
'spec'=>'array',
];
public static $_onSale = ['否','是'];
public static $_isInfinite = ['关闭','开启'];
public static $_ONSALE = ['否','是'];
public static $_ISINFINITE = ['关闭','开启'];
public function getCoverImgUrlAttribute($value)
{
@ -38,12 +38,12 @@ class Goods extends Model
public function getOnSaleTextAttribute($value)
{
$value = $value ? $value : $this->on_sale;
return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : '';
return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : '';
}
public function getIsInfiniteTextAttribute($value)
{
$value = $value ? $value : $this->is_infinite;
return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : '';
}
public function ImageBanners(){
return $this->hasMany('\App\Models\v3\GoodsBanners','goods_id','id')->where('type',1);
@ -62,7 +62,7 @@ class Goods extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

20
app/Models/v3/GoodsActivity.php
View File

@ -24,14 +24,14 @@ class GoodsActivity extends Model
protected $casts = [
'details_imgs'=>'array',
// 'tags'=>'array',
// 'market_ids'=>'array',
'market_ids'=>'array',
'spec'=>'array',
];
public static $_type = ['flash_sale'=>'秒杀','group_buy'=>'团购','new_product'=>'新品'];
public static $_onSale = ['否','是'];
public static $_isInfinite = ['关闭','开启'];
public static $_canUseCoupon = ['否','是'];
public static $_TYPE = ['flash_sale'=>'秒杀','group_buy'=>'团购','new_product'=>'新品'];
public static $_ONSALE = ['否','是'];
public static $_ISINFINITE = ['关闭','开启'];
public static $_CAN_USE_COUPON = ['否','是'];
public function getCoverImgUrlAttribute($value)
{
@ -41,22 +41,22 @@ class GoodsActivity extends Model
public function getTypeTextAttribute($value)
{
$value = $value ? $value : $this->type;
return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : '';
}
public function getOnSaleTextAttribute($value)
{
$value = $value ? $value : $this->on_sale;
return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : '';
return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : '';
}
public function getIsInfiniteTextAttribute($value)
{
$value = $value ? $value : $this->is_infinite;
return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : '';
}
public function getCanUseCouponTextAttribute($value)
{
$value = $value ? $value : $this->can_use_coupon;
return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
return isset(self::$_CAN_USE_COUPON[$value]) ? self::$_CAN_USE_COUPON[$value] : '';
}
public function getExpireTimeTextAttribute()
{
@ -83,7 +83,7 @@ class GoodsActivity extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

10
app/Models/v3/GoodsNew.php
View File

@ -27,8 +27,8 @@ class GoodsNew extends Model
'spec'=>'array',
];
public static $_onSale = ['否','是'];
public static $_isInfinite = ['关闭','开启'];
public static $_ONSALE = ['否','是'];
public static $_ISINFINITE = ['关闭','开启'];
public function getCoverImgUrlAttribute($value)
{
@ -38,12 +38,12 @@ class GoodsNew extends Model
public function getOnSaleTextAttribute($value)
{
$value = $value ? $value : $this->on_sale;
return isset(self::$_onSale[$value]) ? self::$_onSale[$value] : '';
return isset(self::$_ONSALE[$value]) ? self::$_ONSALE[$value] : '';
}
public function getIsInfiniteTextAttribute($value)
{
$value = $value ? $value : $this->is_infinite;
return isset(self::$_isInfinite[$value]) ? self::$_isInfinite[$value] : '';
return isset(self::$_ISINFINITE[$value]) ? self::$_ISINFINITE[$value] : '';
}
public function ImageNewBanners(){
return $this->hasMany('\App\Models\v3\GoodsNewBanners','goods_id','id')->where('type',1);
@ -62,7 +62,7 @@ class GoodsNew extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

91
app/Models/v3/LanzuEmployees.php
View File

@ -0,0 +1,91 @@
<?php
namespace App\Models\v3;
use Dcat\Admin\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Model;
class LanzuEmployees extends Model
{
use HasDateTimeFormatter;
use SoftDeletes;
protected $table = 'lanzu_employees';
protected $dateFormat = 'U';
/* 查询记录数 limit */
protected $perPage = 10;
protected $casts = [
'position'=>'array',
];
public static $_TYPE= [''];
public static $_STATUS = [-1=>'离职',0=>'禁用',1=>'正常'];
protected $appends = [
'type_text',
'status_text'
];
public function getTypeTextAttribute($value)
{
$value = $value ? $value : $this->type;
return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : '';
}
public function getStatusTextAttribute($value)
{
$value = $value ? $value : $this->status;
return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
}
/**
* 根据id获取单条信息
* @param int $id
* @param string $field
* @return string
*/
public static function getInfo($id,$field = '*')
{
return self::select($field)->find($id);
}
/**
* 获取数组
* id为键
* @return array
*/
public static function getArray($where = [], $options = [])
{
$model = self::whereNull('deleted_at');
if(!empty($where)){
$model->where($where);
}
$list = $model->pluck('id','user_id')->toArray();
if(!empty($options)){
$new = array_merge($options,$list);
return array_flip($new);
}else{
return array_flip($list);
}
}
public static function getHorseman($marketId=null)
{
if ($marketId){
$rows = self::where('market_id',$marketId)
->where('position','REGEXP','"29"')
->get();
}else{
$rows = self::where('position','REGEXP','"29"')->get();
}
$item = [];
if ($rows){
foreach ($rows as $row) {
$item[$row->id] = $row->name;
}
}
return $item;
}
}

57
app/Models/v3/ServicePersonnel.php
View File

@ -12,5 +12,60 @@ class ServicePersonnel extends Model
use SoftDeletes;
protected $table = 'lanzu_service_personnel';
protected $dateFormat = 'U';
/* 查询记录数 limit */
protected $perPage = 10;
public static $_TYPE= [1=>'普通专员',2=>'市场经理'];
public static $_STATUS = [-1=>'禁用',0=>'禁用',1=>'启用',2=>'删除'];
protected $appends = [
'type_text',
'status_text'
];
public function getTypeTextAttribute($value)
{
$value = $value ? $value : $this->type;
return isset(self::$_TYPE[$value]) ? self::$_TYPE[$value] : '';
}
public function getStatusTextAttribute($value)
{
$value = $value ? $value : $this->status;
return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
}
/**
* 获取单条信息
* @param int $id
* @param string $field
* @return string
*/
public static function getInfo($id,$field = '*')
{
return self::select($field)->find($id);
}
/**
* 获取二级分类数组
* id为键，title为值
* @return array
*/
public static function getArray($where = [],$options = [])
{
$model = self::where('status',1)
->whereNull('deleted_at');
if(count($where) > 0){
$model->where($where);
}
$list = $model->pluck('id','name')->toArray();
if(!empty($options)){
$new = array_merge($options,$list);
return array_flip($new);
}else{
return array_flip($list);
}
}
}

14
app/Models/v3/Store.php
View File

@ -87,12 +87,16 @@ class Store extends Model
* id为键，name为值
* @return array
*/
public static function getStoreArray()
public static function getStoreArray($where = [], $options = [])
{
$list = self::select('id','name')
$model = self::select('id','name')
->where('status',2)
->whereNull('deleted_at')
->get();
->whereNull('deleted_at');
if(count($where) > 0){
$model->where($where);
}
$list = $model->get();
$array = [];
if(count($list) > 0){
foreach ($list as $value) {
@ -107,7 +111,7 @@ class Store extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

10
app/Models/v3/StoreNew.php
View File

@ -17,8 +17,8 @@ class StoreNew extends Model
/* 查询记录数 limit */
protected $perPage = 10;
public static $_isRest= ['否','是'];
public static $_isOpen = ['关闭','开启'];
public static $_ISREST= ['否','是'];
public static $_ISOPEN = ['关闭','开启'];
protected $appends = [
'logo_url',
@ -35,12 +35,12 @@ class StoreNew extends Model
public function getIsRestTextAttribute($value)
{
$value = $value ? $value : $this->is_rest;
return isset(self::$_onRest[$value]) ? self::$_onRest[$value] : '';
return isset(self::$_ISREST[$value]) ? self::$_ISREST[$value] : '';
}
public function getIsOpenTextAttribute($value)
{
$value = $value ? $value : $this->is_iopen;
return isset(self::$_isOpen[$value]) ? self::$_isOpen[$value] : '';
return isset(self::$_ISOPEN[$value]) ? self::$_ISOPEN[$value] : '';
}
/**
@ -107,7 +107,7 @@ class StoreNew extends Model
public function imageUrl($value)
{
if(strripos($value,"http") === false){
return env('OSS_IMG_HOST').'/'.$value;
return config('filesystems.disks.oss.img_host').'/'.$value;
}else{
return $value;
}

19
app/Models/v3/User.php
View File

@ -9,6 +9,25 @@ class User extends Model
protected $table = 'lanzu_user';
protected $dateFormat = 'U';
public static $_GENDER = ['保密','男','女'];
public static $_STATUS = [0=>'禁用',1=>'正常'];
protected $appends = [
'gender_text',
'status_text'
];
public function getGenderTextAttribute($value)
{
$value = $value ? $value : $this->gender;
return isset(self::$_GENDER[$value]) ? self::$_GENDER[$value] : '';
}
public function getStatusTextAttribute($value)
{
$value = $value ? $value : $this->status;
return isset(self::$_STATUS[$value]) ? self::$_STATUS[$value] : '';
}
/**
* 获取单个用户信息
* @param int $id

85
composer.lock
View File

@ -423,16 +423,16 @@
},
{
"name": "dcat/laravel-admin",
"version": "1.7.3",
"version": "1.7.4",
"source": {
"type": "git",
"url": "https://github.com/jqhph/dcat-admin.git",
"reference": "d3bb2fb7162f400d97c5c9f6baf0815b91f7117b"
"reference": "397f20b719009819d79e1fca5bc0186e468ef56b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/d3bb2fb7162f400d97c5c9f6baf0815b91f7117b",
"reference": "d3bb2fb7162f400d97c5c9f6baf0815b91f7117b",
"url": "https://api.github.com/repos/jqhph/dcat-admin/zipball/397f20b719009819d79e1fca5bc0186e468ef56b",
"reference": "397f20b719009819d79e1fca5bc0186e468ef56b",
"shasum": "",
"mirrors": [
{
@ -491,7 +491,7 @@
"laravel",
"laravel admin"
],
"time": "2020-09-09T13:40:01+00:00"
"time": "2020-09-12T01:06:54+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@ -622,16 +622,16 @@
},
{
"name": "doctrine/dbal",
"version": "2.10.3",
"version": "2.10.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf"
"reference": "47433196b6390d14409a33885ee42b6208160643"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/03ca23afc2ee062f5d3e32426ad37c34a4770dcf",
"reference": "03ca23afc2ee062f5d3e32426ad37c34a4770dcf",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/47433196b6390d14409a33885ee42b6208160643",
"reference": "47433196b6390d14409a33885ee42b6208160643",
"shasum": "",
"mirrors": [
{
@ -719,7 +719,7 @@
"sqlserver",
"sqlsrv"
],
"time": "2020-09-02T01:35:42+00:00"
"time": "2020-09-12T21:20:41+00:00"
},
{
"name": "doctrine/event-manager",
@ -1903,16 +1903,16 @@
},
{
"name": "laravel/framework",
"version": "v7.28.1",
"version": "v7.28.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8"
"reference": "0956b0688d96565044074b77f521a653d9fce5fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8",
"reference": "f7493ab717ca2a9598b1db2d6a3bae8ac8c755e8",
"url": "https://api.github.com/repos/laravel/framework/zipball/0956b0688d96565044074b77f521a653d9fce5fb",
"reference": "0956b0688d96565044074b77f521a653d9fce5fb",
"shasum": "",
"mirrors": [
{
@ -2063,7 +2063,7 @@
"framework",
"laravel"
],
"time": "2020-09-09T15:02:46+00:00"
"time": "2020-09-15T14:48:02+00:00"
},
{
"name": "laravel/scout",
@ -2209,16 +2209,16 @@
},
{
"name": "league/commonmark",
"version": "1.5.4",
"version": "1.5.5",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/commonmark.git",
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba"
"reference": "45832dfed6007b984c0d40addfac48d403dc6432"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/21819c989e69bab07e933866ad30c7e3f32984ba",
"reference": "21819c989e69bab07e933866ad30c7e3f32984ba",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/45832dfed6007b984c0d40addfac48d403dc6432",
"reference": "45832dfed6007b984c0d40addfac48d403dc6432",
"shasum": "",
"mirrors": [
{
@ -2236,7 +2236,7 @@
},
"require-dev": {
"cebe/markdown": "~1.0",
"commonmark/commonmark.js": "0.29.1",
"commonmark/commonmark.js": "0.29.2",
"erusev/parsedown": "~1.0",
"ext-json": "*",
"github/gfm": "0.29.0",
@ -2280,7 +2280,7 @@
"md",
"parser"
],
"time": "2020-08-18T01:19:12+00:00"
"time": "2020-09-13T14:44:46+00:00"
},
{
"name": "league/flysystem",
@ -2906,16 +2906,16 @@
},
{
"name": "overtrue/laravel-wechat",
"version": "5.0.8",
"version": "5.0.9",
"source": {
"type": "git",
"url": "https://github.com/overtrue/laravel-wechat.git",
"reference": "88480ba5997711d2dbf345e1f8dd7d237391aacd"
"reference": "62d5677f70ecd021ce37a7d5155d7d9fb8f303b7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/overtrue/laravel-wechat/zipball/88480ba5997711d2dbf345e1f8dd7d237391aacd",
"reference": "88480ba5997711d2dbf345e1f8dd7d237391aacd",
"url": "https://api.github.com/repos/overtrue/laravel-wechat/zipball/62d5677f70ecd021ce37a7d5155d7d9fb8f303b7",
"reference": "62d5677f70ecd021ce37a7d5155d7d9fb8f303b7",
"shasum": "",
"mirrors": [
{
@ -2926,7 +2926,7 @@
},
"require": {
"illuminate/container": "^5.1 || ^6.0 || ^7.0 || ^8.0",
"overtrue/wechat": "^4.0"
"overtrue/wechat": "^4.0 || ^5.0"
},
"type": "library",
"extra": {
@ -2961,20 +2961,20 @@
"wechat",
"weixin"
],
"time": "2020-09-11T01:15:30+00:00"
"time": "2020-09-13T05:23:10+00:00"
},
{
"name": "overtrue/socialite",
"version": "2.0.16",
"version": "2.0.18",
"source": {
"type": "git",
"url": "https://github.com/overtrue/socialite.git",
"reference": "bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067"
"reference": "d8c3ed6281939e7d2dc4da460b484886f686f8a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/overtrue/socialite/zipball/bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067",
"reference": "bbcd8ffd2e1f3aa7c4d5298c56c6d73803aa3067",
"url": "https://api.github.com/repos/overtrue/socialite/zipball/d8c3ed6281939e7d2dc4da460b484886f686f8a5",
"reference": "d8c3ed6281939e7d2dc4da460b484886f686f8a5",
"shasum": "",
"mirrors": [
{
@ -2985,8 +2985,8 @@
},
"require": {
"ext-json": "*",
"guzzlehttp/guzzle": "~5.0|~6.0",
"php": ">=7.0",
"guzzlehttp/guzzle": "^5.0|^6.0|^7.0",
"php": ">=5.6",
"symfony/http-foundation": "^2.7|^3.0|^4.0|^5.0"
},
"conflict": {
@ -3021,7 +3021,7 @@
"wechat",
"weibo"
],
"time": "2020-03-04T15:22:25+00:00"
"time": "2020-09-14T08:34:23+00:00"
},
{
"name": "overtrue/wechat",
@ -3920,16 +3920,16 @@
},
{
"name": "spatie/eloquent-sortable",
"version": "3.8.3",
"version": "3.9.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/eloquent-sortable.git",
"reference": "7087d3050b19f29348faead5385eddee50d4c3b5"
"reference": "51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/7087d3050b19f29348faead5385eddee50d4c3b5",
"reference": "7087d3050b19f29348faead5385eddee50d4c3b5",
"url": "https://api.github.com/repos/spatie/eloquent-sortable/zipball/51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2",
"reference": "51bca09f0c49ac2da8cd480e1e667ddcfce5a3f2",
"shasum": "",
"mirrors": [
{
@ -3949,6 +3949,13 @@
"phpunit/phpunit": "^8.0|^9.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Spatie\\EloquentSortable\\EloquentSortableServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Spatie\\EloquentSortable\\": "src/"
@ -3974,7 +3981,7 @@
"sort",
"sortable"
],
"time": "2020-09-08T18:12:01+00:00"
"time": "2020-09-15T06:48:07+00:00"
},
{
"name": "swiftmailer/swiftmailer",

5
config/filesystems.php
View File

@ -67,10 +67,13 @@ return [
'secret_key' => env('OSS_ACCESS_SECRET'),
'endpoint' => env('OSS_ENDPOINT'), // 使用 ssl 这里设置如: https://oss-cn-beijing.aliyuncs.com
'bucket' => env('OSS_BUCKET'),
'isCName' => env('OSS_IS_CNAME', false), // 如果 isCname 为 false，endpoint 应配置 oss 提供的域名如：`oss-cn-beijing.aliyuncs.com`，否则为自定义域名，，cname 或 cdn 请自行到阿里 oss 后台配置并绑定 bucket
'isCName' => env('OSS_IS_CNAME', false),
// 如果 isCname 为 false，endpoint 应配置 oss 提供的域名如：`oss-cn-beijing.aliyuncs.com`，否则为自定义域名，，cname 或 cdn 请自行到阿里 oss 后台配置并绑定 bucket
// 如果有更多的 bucket 需要切换，就添加所有bucket，默认的 bucket 填写到上面，不要加到 buckets 中
'buckets'=>[
],
'img_host' => env('OSS_IMG_HOST'),
'store_image_resize' => '?x-oss-process=image/crop,x_5,y_5,w_270,h_270'
],
's3' => [

42
config/role.php
View File

@ -0,0 +1,42 @@
<?php
/**
* 懒族员工角色,职位
*/
return [
'position'=>[
1 => '董事长',
2 => '总经理',
3 => '人力资源总监',
4 => 'CTO',
5 => '财务经理',
6 => '运营总监',
7 => '招商总监',
8 => 'PHP研发主管',
9 => '迁江智慧商城主管',
10 => '拓展部主管',
11 => '拓展部副主管',
12 => '拓展部经理',
13 => '运维部经理',
14 => '产品主管',
15 => '策划经理',
16 => '运维部副经理',
17 => '新媒体运营',
18 => '平面设计师',
19 => 'UI设计师',
20 => '前端开发工程师',
21 => 'PHP研发工程师',
22 => '测试工程师',
23 => '招商经理',
24 => '服务站管理员',
25 => '运维专员',
26 => '拓展经理',
27 => '行政助理',
28 => '出纳',
29 => '骑手',
30 => '服务专员',
]
];

192
dcat_admin_ide_helper.php
View File

@ -38,22 +38,13 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection imgs
* @property Grid\Column|Collection addtime
* @property Grid\Column|Collection sort
* @property Grid\Column|Collection coordinates
* @property Grid\Column|Collection remark
* @property Grid\Column|Collection poundage
* @property Grid\Column|Collection dn_poundage
* @property Grid\Column|Collection dm_poundage
* @property Grid\Column|Collection yd_poundage
* @property Grid\Column|Collection loudspeaker_imei
* @property Grid\Column|Collection dishes_menu_intro
* @property Grid\Column|Collection create_time
* @property Grid\Column|Collection logo_url
* @property Grid\Column|Collection mm_user_id
* @property Grid\Column|Collection store_applet_img
* @property Grid\Column|Collection cash_code_img
* @property Grid\Column|Collection tel
* @property Grid\Column|Collection is_rest
* @property Grid\Column|Collection is_open
* @property Grid\Column|Collection width
* @property Grid\Column|Collection award_money
* @property Grid\Column|Collection img
* @property Grid\Column|Collection start_at
* @property Grid\Column|Collection freight
* @property Grid\Column|Collection money
* @property Grid\Column|Collection mp_id
* @property Grid\Column|Collection is_pay
@ -68,6 +59,7 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection repay
* @property Grid\Column|Collection category_text
* @property Grid\Column|Collection value
* @property Grid\Column|Collection width
* @property Grid\Column|Collection start_time_text
* @property Grid\Column|Collection end_time_text
* @property Grid\Column|Collection full_amount
@ -91,11 +83,21 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection store_id
* @property Grid\Column|Collection store_name
* @property Grid\Column|Collection new_user_total
* @property Grid\Column|Collection mm_user_id
* @property Grid\Column|Collection logo_url
* @property Grid\Column|Collection store_applet_img
* @property Grid\Column|Collection cash_code_img
* @property Grid\Column|Collection is_open
* @property Grid\Column|Collection cover_img_url
* @property Grid\Column|Collection price
* @property Grid\Column|Collection category_id
* @property Grid\Column|Collection goods_category_id
* @property Grid\Column|Collection on_sale
* @property Grid\Column|Collection order_num
* @property Grid\Column|Collection state
* @property Grid\Column|Collection pay_time
* @property Grid\Column|Collection time
* @property Grid\Column|Collection head_url
* @property Grid\Column|Collection parent_id
* @property Grid\Column|Collection order
* @property Grid\Column|Collection icon
@ -183,7 +185,6 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection refreshtime
* @property Grid\Column|Collection deletetime
* @property Grid\Column|Collection switch
* @property Grid\Column|Collection state
* @property Grid\Column|Collection gender
* @property Grid\Column|Collection birthday
* @property Grid\Column|Collection bio
@ -276,9 +277,7 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection item
* @property Grid\Column|Collection area_name
* @property Grid\Column|Collection num
* @property Grid\Column|Collection img
* @property Grid\Column|Collection stars
* @property Grid\Column|Collection time
* @property Grid\Column|Collection order_id
* @property Grid\Column|Collection hf
* @property Grid\Column|Collection hf_time
@ -375,14 +374,12 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection display
* @property Grid\Column|Collection introduction
* @property Grid\Column|Collection hx_id
* @property Grid\Column|Collection order_num
* @property Grid\Column|Collection goods_type
* @property Grid\Column|Collection goods_num
* @property Grid\Column|Collection pay_type
* @property Grid\Column|Collection receive_name
* @property Grid\Column|Collection receive_tel
* @property Grid\Column|Collection receive_address
* @property Grid\Column|Collection pay_time
* @property Grid\Column|Collection cz_time
* @property Grid\Column|Collection question
* @property Grid\Column|Collection answer
@ -412,9 +409,16 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection waimai_pay_temp
* @property Grid\Column|Collection dangmian_pay_temp
* @property Grid\Column|Collection ziti_pay_temp
* @property Grid\Column|Collection coordinates
* @property Grid\Column|Collection poundage
* @property Grid\Column|Collection dn_poundage
* @property Grid\Column|Collection dm_poundage
* @property Grid\Column|Collection yd_poundage
* @property Grid\Column|Collection dada_number
* @property Grid\Column|Collection is_open_dada
* @property Grid\Column|Collection tel
* @property Grid\Column|Collection loudspeaker_imei
* @property Grid\Column|Collection dishes_menu_intro
* @property Grid\Column|Collection create_time
* @property Grid\Column|Collection deleted_at
* @property Grid\Column|Collection sender
* @property Grid\Column|Collection is_email
@ -557,8 +561,6 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection sss_shop_token
* @property Grid\Column|Collection time4
* @property Grid\Column|Collection announcement
* @property Grid\Column|Collection start_at
* @property Grid\Column|Collection freight
* @property Grid\Column|Collection yyzz
* @property Grid\Column|Collection md_area
* @property Grid\Column|Collection md_type
@ -585,7 +587,6 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection store_mchid
* @property Grid\Column|Collection cash_code
* @property Grid\Column|Collection store_wallet
* @property Grid\Column|Collection award_money
* @property Grid\Column|Collection add_time
* @property Grid\Column|Collection category
* @property Grid\Column|Collection xyh_open
@ -1216,7 +1217,6 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection service_personnel_id
* @property Grid\Column|Collection user_created_at
* @property Grid\Column|Collection qr_url
* @property Grid\Column|Collection head_url
* @property Grid\Column|Collection set_reward
* @property Grid\Column|Collection device_name
* @property Grid\Column|Collection bind_time
@ -1266,22 +1266,13 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection imgs(string $label = null)
* @method Grid\Column|Collection addtime(string $label = null)
* @method Grid\Column|Collection sort(string $label = null)
* @method Grid\Column|Collection coordinates(string $label = null)
* @method Grid\Column|Collection remark(string $label = null)
* @method Grid\Column|Collection poundage(string $label = null)
* @method Grid\Column|Collection dn_poundage(string $label = null)
* @method Grid\Column|Collection dm_poundage(string $label = null)
* @method Grid\Column|Collection yd_poundage(string $label = null)
* @method Grid\Column|Collection loudspeaker_imei(string $label = null)
* @method Grid\Column|Collection dishes_menu_intro(string $label = null)
* @method Grid\Column|Collection create_time(string $label = null)
* @method Grid\Column|Collection logo_url(string $label = null)
* @method Grid\Column|Collection mm_user_id(string $label = null)
* @method Grid\Column|Collection store_applet_img(string $label = null)
* @method Grid\Column|Collection cash_code_img(string $label = null)
* @method Grid\Column|Collection tel(string $label = null)
* @method Grid\Column|Collection is_rest(string $label = null)
* @method Grid\Column|Collection is_open(string $label = null)
* @method Grid\Column|Collection width(string $label = null)
* @method Grid\Column|Collection award_money(string $label = null)
* @method Grid\Column|Collection img(string $label = null)
* @method Grid\Column|Collection start_at(string $label = null)
* @method Grid\Column|Collection freight(string $label = null)
* @method Grid\Column|Collection money(string $label = null)
* @method Grid\Column|Collection mp_id(string $label = null)
* @method Grid\Column|Collection is_pay(string $label = null)
@ -1296,6 +1287,7 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection repay(string $label = null)
* @method Grid\Column|Collection category_text(string $label = null)
* @method Grid\Column|Collection value(string $label = null)
* @method Grid\Column|Collection width(string $label = null)
* @method Grid\Column|Collection start_time_text(string $label = null)
* @method Grid\Column|Collection end_time_text(string $label = null)
* @method Grid\Column|Collection full_amount(string $label = null)
@ -1319,11 +1311,21 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection store_id(string $label = null)
* @method Grid\Column|Collection store_name(string $label = null)
* @method Grid\Column|Collection new_user_total(string $label = null)
* @method Grid\Column|Collection mm_user_id(string $label = null)
* @method Grid\Column|Collection logo_url(string $label = null)
* @method Grid\Column|Collection store_applet_img(string $label = null)
* @method Grid\Column|Collection cash_code_img(string $label = null)
* @method Grid\Column|Collection is_open(string $label = null)
* @method Grid\Column|Collection cover_img_url(string $label = null)
* @method Grid\Column|Collection price(string $label = null)
* @method Grid\Column|Collection category_id(string $label = null)
* @method Grid\Column|Collection goods_category_id(string $label = null)
* @method Grid\Column|Collection on_sale(string $label = null)
* @method Grid\Column|Collection order_num(string $label = null)
* @method Grid\Column|Collection state(string $label = null)
* @method Grid\Column|Collection pay_time(string $label = null)
* @method Grid\Column|Collection time(string $label = null)
* @method Grid\Column|Collection head_url(string $label = null)
* @method Grid\Column|Collection parent_id(string $label = null)
* @method Grid\Column|Collection order(string $label = null)
* @method Grid\Column|Collection icon(string $label = null)
@ -1411,7 +1413,6 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection refreshtime(string $label = null)
* @method Grid\Column|Collection deletetime(string $label = null)
* @method Grid\Column|Collection switch(string $label = null)
* @method Grid\Column|Collection state(string $label = null)
* @method Grid\Column|Collection gender(string $label = null)
* @method Grid\Column|Collection birthday(string $label = null)
* @method Grid\Column|Collection bio(string $label = null)
@ -1504,9 +1505,7 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection item(string $label = null)
* @method Grid\Column|Collection area_name(string $label = null)
* @method Grid\Column|Collection num(string $label = null)
* @method Grid\Column|Collection img(string $label = null)
* @method Grid\Column|Collection stars(string $label = null)
* @method Grid\Column|Collection time(string $label = null)
* @method Grid\Column|Collection order_id(string $label = null)
* @method Grid\Column|Collection hf(string $label = null)
* @method Grid\Column|Collection hf_time(string $label = null)
@ -1603,14 +1602,12 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection display(string $label = null)
* @method Grid\Column|Collection introduction(string $label = null)
* @method Grid\Column|Collection hx_id(string $label = null)
* @method Grid\Column|Collection order_num(string $label = null)
* @method Grid\Column|Collection goods_type(string $label = null)
* @method Grid\Column|Collection goods_num(string $label = null)
* @method Grid\Column|Collection pay_type(string $label = null)
* @method Grid\Column|Collection receive_name(string $label = null)
* @method Grid\Column|Collection receive_tel(string $label = null)
* @method Grid\Column|Collection receive_address(string $label = null)
* @method Grid\Column|Collection pay_time(string $label = null)
* @method Grid\Column|Collection cz_time(string $label = null)
* @method Grid\Column|Collection question(string $label = null)
* @method Grid\Column|Collection answer(string $label = null)
@ -1640,9 +1637,16 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection waimai_pay_temp(string $label = null)
* @method Grid\Column|Collection dangmian_pay_temp(string $label = null)
* @method Grid\Column|Collection ziti_pay_temp(string $label = null)
* @method Grid\Column|Collection coordinates(string $label = null)
* @method Grid\Column|Collection poundage(string $label = null)
* @method Grid\Column|Collection dn_poundage(string $label = null)
* @method Grid\Column|Collection dm_poundage(string $label = null)
* @method Grid\Column|Collection yd_poundage(string $label = null)
* @method Grid\Column|Collection dada_number(string $label = null)
* @method Grid\Column|Collection is_open_dada(string $label = null)
* @method Grid\Column|Collection tel(string $label = null)
* @method Grid\Column|Collection loudspeaker_imei(string $label = null)
* @method Grid\Column|Collection dishes_menu_intro(string $label = null)
* @method Grid\Column|Collection create_time(string $label = null)
* @method Grid\Column|Collection deleted_at(string $label = null)
* @method Grid\Column|Collection sender(string $label = null)
* @method Grid\Column|Collection is_email(string $label = null)
@ -1785,8 +1789,6 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection sss_shop_token(string $label = null)
* @method Grid\Column|Collection time4(string $label = null)
* @method Grid\Column|Collection announcement(string $label = null)
* @method Grid\Column|Collection start_at(string $label = null)
* @method Grid\Column|Collection freight(string $label = null)
* @method Grid\Column|Collection yyzz(string $label = null)
* @method Grid\Column|Collection md_area(string $label = null)
* @method Grid\Column|Collection md_type(string $label = null)
@ -1813,7 +1815,6 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection store_mchid(string $label = null)
* @method Grid\Column|Collection cash_code(string $label = null)
* @method Grid\Column|Collection store_wallet(string $label = null)
* @method Grid\Column|Collection award_money(string $label = null)
* @method Grid\Column|Collection add_time(string $label = null)
* @method Grid\Column|Collection category(string $label = null)
* @method Grid\Column|Collection xyh_open(string $label = null)
@ -2444,7 +2445,6 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection service_personnel_id(string $label = null)
* @method Grid\Column|Collection user_created_at(string $label = null)
* @method Grid\Column|Collection qr_url(string $label = null)
* @method Grid\Column|Collection head_url(string $label = null)
* @method Grid\Column|Collection set_reward(string $label = null)
* @method Grid\Column|Collection device_name(string $label = null)
* @method Grid\Column|Collection bind_time(string $label = null)
@ -2499,22 +2499,13 @@ namespace Dcat\Admin {
* @property Show\Field|Collection imgs
* @property Show\Field|Collection addtime
* @property Show\Field|Collection sort
* @property Show\Field|Collection coordinates
* @property Show\Field|Collection remark
* @property Show\Field|Collection poundage
* @property Show\Field|Collection dn_poundage
* @property Show\Field|Collection dm_poundage
* @property Show\Field|Collection yd_poundage
* @property Show\Field|Collection loudspeaker_imei
* @property Show\Field|Collection dishes_menu_intro
* @property Show\Field|Collection create_time
* @property Show\Field|Collection logo_url
* @property Show\Field|Collection mm_user_id
* @property Show\Field|Collection store_applet_img
* @property Show\Field|Collection cash_code_img
* @property Show\Field|Collection tel
* @property Show\Field|Collection is_rest
* @property Show\Field|Collection is_open
* @property Show\Field|Collection width
* @property Show\Field|Collection award_money
* @property Show\Field|Collection img
* @property Show\Field|Collection start_at
* @property Show\Field|Collection freight
* @property Show\Field|Collection money
* @property Show\Field|Collection mp_id
* @property Show\Field|Collection is_pay
@ -2529,6 +2520,7 @@ namespace Dcat\Admin {
* @property Show\Field|Collection repay
* @property Show\Field|Collection category_text
* @property Show\Field|Collection value
* @property Show\Field|Collection width
* @property Show\Field|Collection start_time_text
* @property Show\Field|Collection end_time_text
* @property Show\Field|Collection full_amount
@ -2552,11 +2544,21 @@ namespace Dcat\Admin {
* @property Show\Field|Collection store_id
* @property Show\Field|Collection store_name
* @property Show\Field|Collection new_user_total
* @property Show\Field|Collection mm_user_id
* @property Show\Field|Collection logo_url
* @property Show\Field|Collection store_applet_img
* @property Show\Field|Collection cash_code_img
* @property Show\Field|Collection is_open
* @property Show\Field|Collection cover_img_url
* @property Show\Field|Collection price
* @property Show\Field|Collection category_id
* @property Show\Field|Collection goods_category_id
* @property Show\Field|Collection on_sale
* @property Show\Field|Collection order_num
* @property Show\Field|Collection state
* @property Show\Field|Collection pay_time
* @property Show\Field|Collection time
* @property Show\Field|Collection head_url
* @property Show\Field|Collection parent_id
* @property Show\Field|Collection order
* @property Show\Field|Collection icon
@ -2644,7 +2646,6 @@ namespace Dcat\Admin {
* @property Show\Field|Collection refreshtime
* @property Show\Field|Collection deletetime
* @property Show\Field|Collection switch
* @property Show\Field|Collection state
* @property Show\Field|Collection gender
* @property Show\Field|Collection birthday
* @property Show\Field|Collection bio
@ -2737,9 +2738,7 @@ namespace Dcat\Admin {
* @property Show\Field|Collection item
* @property Show\Field|Collection area_name
* @property Show\Field|Collection num
* @property Show\Field|Collection img
* @property Show\Field|Collection stars
* @property Show\Field|Collection time
* @property Show\Field|Collection order_id
* @property Show\Field|Collection hf
* @property Show\Field|Collection hf_time
@ -2836,14 +2835,12 @@ namespace Dcat\Admin {
* @property Show\Field|Collection display
* @property Show\Field|Collection introduction
* @property Show\Field|Collection hx_id
* @property Show\Field|Collection order_num
* @property Show\Field|Collection goods_type
* @property Show\Field|Collection goods_num
* @property Show\Field|Collection pay_type
* @property Show\Field|Collection receive_name
* @property Show\Field|Collection receive_tel
* @property Show\Field|Collection receive_address
* @property Show\Field|Collection pay_time
* @property Show\Field|Collection cz_time
* @property Show\Field|Collection question
* @property Show\Field|Collection answer
@ -2873,9 +2870,16 @@ namespace Dcat\Admin {
* @property Show\Field|Collection waimai_pay_temp
* @property Show\Field|Collection dangmian_pay_temp
* @property Show\Field|Collection ziti_pay_temp
* @property Show\Field|Collection coordinates
* @property Show\Field|Collection poundage
* @property Show\Field|Collection dn_poundage
* @property Show\Field|Collection dm_poundage
* @property Show\Field|Collection yd_poundage
* @property Show\Field|Collection dada_number
* @property Show\Field|Collection is_open_dada
* @property Show\Field|Collection tel
* @property Show\Field|Collection loudspeaker_imei
* @property Show\Field|Collection dishes_menu_intro
* @property Show\Field|Collection create_time
* @property Show\Field|Collection deleted_at
* @property Show\Field|Collection sender
* @property Show\Field|Collection is_email
@ -3018,8 +3022,6 @@ namespace Dcat\Admin {
* @property Show\Field|Collection sss_shop_token
* @property Show\Field|Collection time4
* @property Show\Field|Collection announcement
* @property Show\Field|Collection start_at
* @property Show\Field|Collection freight
* @property Show\Field|Collection yyzz
* @property Show\Field|Collection md_area
* @property Show\Field|Collection md_type
@ -3046,7 +3048,6 @@ namespace Dcat\Admin {
* @property Show\Field|Collection store_mchid
* @property Show\Field|Collection cash_code
* @property Show\Field|Collection store_wallet
* @property Show\Field|Collection award_money
* @property Show\Field|Collection add_time
* @property Show\Field|Collection category
* @property Show\Field|Collection xyh_open
@ -3677,7 +3678,6 @@ namespace Dcat\Admin {
* @property Show\Field|Collection service_personnel_id
* @property Show\Field|Collection user_created_at
* @property Show\Field|Collection qr_url
* @property Show\Field|Collection head_url
* @property Show\Field|Collection set_reward
* @property Show\Field|Collection device_name
* @property Show\Field|Collection bind_time
@ -3727,22 +3727,13 @@ namespace Dcat\Admin {
* @method Show\Field|Collection imgs(string $label = null)
* @method Show\Field|Collection addtime(string $label = null)
* @method Show\Field|Collection sort(string $label = null)
* @method Show\Field|Collection coordinates(string $label = null)
* @method Show\Field|Collection remark(string $label = null)
* @method Show\Field|Collection poundage(string $label = null)
* @method Show\Field|Collection dn_poundage(string $label = null)
* @method Show\Field|Collection dm_poundage(string $label = null)
* @method Show\Field|Collection yd_poundage(string $label = null)
* @method Show\Field|Collection loudspeaker_imei(string $label = null)
* @method Show\Field|Collection dishes_menu_intro(string $label = null)
* @method Show\Field|Collection create_time(string $label = null)
* @method Show\Field|Collection logo_url(string $label = null)
* @method Show\Field|Collection mm_user_id(string $label = null)
* @method Show\Field|Collection store_applet_img(string $label = null)
* @method Show\Field|Collection cash_code_img(string $label = null)
* @method Show\Field|Collection tel(string $label = null)
* @method Show\Field|Collection is_rest(string $label = null)
* @method Show\Field|Collection is_open(string $label = null)
* @method Show\Field|Collection width(string $label = null)
* @method Show\Field|Collection award_money(string $label = null)
* @method Show\Field|Collection img(string $label = null)
* @method Show\Field|Collection start_at(string $label = null)
* @method Show\Field|Collection freight(string $label = null)
* @method Show\Field|Collection money(string $label = null)
* @method Show\Field|Collection mp_id(string $label = null)
* @method Show\Field|Collection is_pay(string $label = null)
@ -3757,6 +3748,7 @@ namespace Dcat\Admin {
* @method Show\Field|Collection repay(string $label = null)
* @method Show\Field|Collection category_text(string $label = null)
* @method Show\Field|Collection value(string $label = null)
* @method Show\Field|Collection width(string $label = null)
* @method Show\Field|Collection start_time_text(string $label = null)
* @method Show\Field|Collection end_time_text(string $label = null)
* @method Show\Field|Collection full_amount(string $label = null)
@ -3780,11 +3772,21 @@ namespace Dcat\Admin {
* @method Show\Field|Collection store_id(string $label = null)
* @method Show\Field|Collection store_name(string $label = null)
* @method Show\Field|Collection new_user_total(string $label = null)
* @method Show\Field|Collection mm_user_id(string $label = null)
* @method Show\Field|Collection logo_url(string $label = null)
* @method Show\Field|Collection store_applet_img(string $label = null)
* @method Show\Field|Collection cash_code_img(string $label = null)
* @method Show\Field|Collection is_open(string $label = null)
* @method Show\Field|Collection cover_img_url(string $label = null)
* @method Show\Field|Collection price(string $label = null)
* @method Show\Field|Collection category_id(string $label = null)
* @method Show\Field|Collection goods_category_id(string $label = null)
* @method Show\Field|Collection on_sale(string $label = null)
* @method Show\Field|Collection order_num(string $label = null)
* @method Show\Field|Collection state(string $label = null)
* @method Show\Field|Collection pay_time(string $label = null)
* @method Show\Field|Collection time(string $label = null)
* @method Show\Field|Collection head_url(string $label = null)
* @method Show\Field|Collection parent_id(string $label = null)
* @method Show\Field|Collection order(string $label = null)
* @method Show\Field|Collection icon(string $label = null)
@ -3872,7 +3874,6 @@ namespace Dcat\Admin {
* @method Show\Field|Collection refreshtime(string $label = null)
* @method Show\Field|Collection deletetime(string $label = null)
* @method Show\Field|Collection switch(string $label = null)
* @method Show\Field|Collection state(string $label = null)
* @method Show\Field|Collection gender(string $label = null)
* @method Show\Field|Collection birthday(string $label = null)
* @method Show\Field|Collection bio(string $label = null)
@ -3965,9 +3966,7 @@ namespace Dcat\Admin {
* @method Show\Field|Collection item(string $label = null)
* @method Show\Field|Collection area_name(string $label = null)
* @method Show\Field|Collection num(string $label = null)
* @method Show\Field|Collection img(string $label = null)
* @method Show\Field|Collection stars(string $label = null)
* @method Show\Field|Collection time(string $label = null)
* @method Show\Field|Collection order_id(string $label = null)
* @method Show\Field|Collection hf(string $label = null)
* @method Show\Field|Collection hf_time(string $label = null)
@ -4064,14 +4063,12 @@ namespace Dcat\Admin {
* @method Show\Field|Collection display(string $label = null)
* @method Show\Field|Collection introduction(string $label = null)
* @method Show\Field|Collection hx_id(string $label = null)
* @method Show\Field|Collection order_num(string $label = null)
* @method Show\Field|Collection goods_type(string $label = null)
* @method Show\Field|Collection goods_num(string $label = null)
* @method Show\Field|Collection pay_type(string $label = null)
* @method Show\Field|Collection receive_name(string $label = null)
* @method Show\Field|Collection receive_tel(string $label = null)
* @method Show\Field|Collection receive_address(string $label = null)
* @method Show\Field|Collection pay_time(string $label = null)
* @method Show\Field|Collection cz_time(string $label = null)
* @method Show\Field|Collection question(string $label = null)
* @method Show\Field|Collection answer(string $label = null)
@ -4101,9 +4098,16 @@ namespace Dcat\Admin {
* @method Show\Field|Collection waimai_pay_temp(string $label = null)
* @method Show\Field|Collection dangmian_pay_temp(string $label = null)
* @method Show\Field|Collection ziti_pay_temp(string $label = null)
* @method Show\Field|Collection coordinates(string $label = null)
* @method Show\Field|Collection poundage(string $label = null)
* @method Show\Field|Collection dn_poundage(string $label = null)
* @method Show\Field|Collection dm_poundage(string $label = null)
* @method Show\Field|Collection yd_poundage(string $label = null)
* @method Show\Field|Collection dada_number(string $label = null)
* @method Show\Field|Collection is_open_dada(string $label = null)
* @method Show\Field|Collection tel(string $label = null)
* @method Show\Field|Collection loudspeaker_imei(string $label = null)
* @method Show\Field|Collection dishes_menu_intro(string $label = null)
* @method Show\Field|Collection create_time(string $label = null)
* @method Show\Field|Collection deleted_at(string $label = null)
* @method Show\Field|Collection sender(string $label = null)
* @method Show\Field|Collection is_email(string $label = null)
@ -4246,8 +4250,6 @@ namespace Dcat\Admin {
* @method Show\Field|Collection sss_shop_token(string $label = null)
* @method Show\Field|Collection time4(string $label = null)
* @method Show\Field|Collection announcement(string $label = null)
* @method Show\Field|Collection start_at(string $label = null)
* @method Show\Field|Collection freight(string $label = null)
* @method Show\Field|Collection yyzz(string $label = null)
* @method Show\Field|Collection md_area(string $label = null)
* @method Show\Field|Collection md_type(string $label = null)
@ -4274,7 +4276,6 @@ namespace Dcat\Admin {
* @method Show\Field|Collection store_mchid(string $label = null)
* @method Show\Field|Collection cash_code(string $label = null)
* @method Show\Field|Collection store_wallet(string $label = null)
* @method Show\Field|Collection award_money(string $label = null)
* @method Show\Field|Collection add_time(string $label = null)
* @method Show\Field|Collection category(string $label = null)
* @method Show\Field|Collection xyh_open(string $label = null)
@ -4905,7 +4906,6 @@ namespace Dcat\Admin {
* @method Show\Field|Collection service_personnel_id(string $label = null)
* @method Show\Field|Collection user_created_at(string $label = null)
* @method Show\Field|Collection qr_url(string $label = null)
* @method Show\Field|Collection head_url(string $label = null)
* @method Show\Field|Collection set_reward(string $label = null)
* @method Show\Field|Collection device_name(string $label = null)
* @method Show\Field|Collection bind_time(string $label = null)

13
resources/lang/zh-CN/lanzu-admin-user-market.php
View File

@ -0,0 +1,13 @@
<?php
return [
'labels' => [
'LanzuAdminUserMarket' => '用户市场关联',
'admin_user_market'=>'用户关联市场'
],
'fields' => [
'admin_user_id' => '用户登陆账号ID',
'market_id' => '市场ID',
],
'options' => [
],
];

22
resources/lang/zh-CN/lanzu-employees.php
View File

@ -0,0 +1,22 @@
<?php
return [
'labels' => [
'LanzuEmployees' => '懒族员工',
'lanzuEmployees' => '懒族员工',
'lanzu_employees' => '懒族员工',
'employees' => '懒族员工',
],
'fields' => [
'user_id' => '用户懒ID',
'store_id' => '店铺',
'name' => '姓名',
'tel' => '电话',
'market_id' => '服务站',
'position' => '职位',
'status' => '状态',
'status_text' => '状态',
'note' => '备注',
],
'options' => [
],
];

2
resources/lang/zh-CN/service-personnel.php
View File

@ -6,7 +6,7 @@ return [
'service_personnel' => '服务站专员',
],
'fields' => [
'user_id' => '服务员懒ID',
'user_id' => '服务专员懒ID',
'name' => '姓名',
'tel' => '电话',
'market_id' => '所属市场',

2
resources/lang/zh-CN/store.php
View File

@ -9,7 +9,7 @@ return [
'market_name' => '所属市场',
'name' => '商家名称',
'address' => '商家地址',
'time' => '营业时间',
'time1' => '营业时间',
'time2' => '营业时间',
'time3' => '营业时间',
'time4' => '营业时间',

25
resources/lang/zh-CN/user.php
View File

@ -0,0 +1,25 @@
<?php
return [
'labels' => [
'User' => '微信用户',
'user' => '微信用户',
],
'fields' => [
'nick_name' => '昵称',
'avatar' => '微信头像',
'openid' => '微信小程序openid',
'real_name' => '真实姓名',
'tel' => '电话号码',
'unionid' => '微信小程序unionid',
'status' => '状态',
'status_text' => '状态',
'country' => '国家',
'province' => '省份',
'city' => '城市',
'gender' => '性别',
'gender_text' => '性别',
'language' => '语言',
],
'options' => [
],
];

3
resources/views/orderdetail.php
View File

@ -39,7 +39,6 @@
<img class="shop-logo" :src="item.store.logo" alt="店铺logo"/>
<span>{{item.store.name}}</span>
</div>
店铺商品
<div class="media" v-for= "goods in item.goods">
<img class="logo-img" :src="goods.cover_img" class="align-self-center mr-3" alt="商品图片">
<div class="media-body">
@ -64,7 +63,7 @@
&ensp;&ensp;
配送费: <span style="color: green">+{{delivery_money}}</span> 元
&ensp;&ensp;
增值服务费: <span style="color: green">+{{services_money}}</span> 元
增值服务费: <span style="color: green">+{{services_money?services_money:0}}</span> 元
&ensp;&ensp;
实付金额: {{money}} 元

Write Preview
Loading…
Cancel
Save