diff --git a/app/Admin/Controllers/BalanceLogController.php b/app/Admin/Controllers/BalanceLogController.php new file mode 100644 index 00000000..852af92b --- /dev/null +++ b/app/Admin/Controllers/BalanceLogController.php @@ -0,0 +1,89 @@ +tools(function (Grid\Tools $tools) { + $tools->append(new Recharge()); + $tools->append(new Deduction()); + }); + // $grid->column('id')->sortable(); + $grid->column('user.phone')->copyable(); + $grid->column('remarks'); + $grid->column('change_balance')->display(function ($value) { + return bcdiv($value, 100, 2); + }); + $grid->column('before_balance')->display(function ($value) { + return bcdiv($value, 100, 2); + }); + + $grid->column('created_at')->sortable(); + // $grid->column('updated_at')->sortable(); + + $grid->model()->orderBy('created_at', 'desc'); + + $grid->disableActions(); + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(false); + $filter->equal('user.phone')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new BalanceLog(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('before_balance'); + $show->field('change_balance'); + $show->field('remarks'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new BalanceLog(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('before_balance'); + $form->text('change_balance'); + $form->text('remarks'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/DistributionPreIncomeController.php b/app/Admin/Controllers/DistributionPreIncomeController.php new file mode 100644 index 00000000..1220de23 --- /dev/null +++ b/app/Admin/Controllers/DistributionPreIncomeController.php @@ -0,0 +1,104 @@ +column('id')->sortable(); + $grid->column('user.phone')->copyable(); + $grid->column('user.userInfo.inviterInfo.user.phone', '邀请人手机号')->copyable(); + $grid->column('order.sn')->copyable(); + $grid->column('type')->using(DistributionPreIncomeModel::$typeTexts)->label(); + $grid->column('agent_level')->display(function () { + return $this->agent_level_name; + })->label(); + $grid->column('total_amount'); + $grid->column('total_sales_value'); + $grid->column('total_revenue'); + $grid->column('status')->using(DistributionPreIncomeModel::$statusTexts)->dot([ + 0=>'danger', + 1=>'danger', + 2=>'success', + ]); + $grid->column('remarks'); + $grid->column('completed_at'); + $grid->column('created_at')->sortable(); + + $grid->model()->orderBy('order_id', 'desc'); + $grid->model()->orderBy('id', 'asc'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(false); + $filter->equal('user.phone')->width(3); + $filter->equal('order.sn')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new DistributionPreIncome(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('order_id'); + $show->field('type'); + $show->field('agent_level'); + $show->field('total_amount'); + $show->field('total_sales_value'); + $show->field('total_revenue'); + $show->field('status'); + $show->field('remarks'); + $show->field('completed_at'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new DistributionPreIncome(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('order_id'); + $form->text('type'); + $form->text('agent_level'); + $form->text('total_amount'); + $form->text('total_sales_value'); + $form->text('total_revenue'); + $form->text('status'); + $form->text('remarks'); + $form->text('completed_at'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index 5c9f9cf0..2deffa11 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -14,6 +14,7 @@ use App\Admin\Renderable\UserBalanceLogSimpleTable; use App\Admin\Renderable\UserFansSimpleTable; use App\Admin\Renderable\UserWalletLogSimpleTable; use App\Admin\Repositories\User; +use App\Models\User as UserModel; use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; @@ -22,7 +23,8 @@ use Dcat\Admin\Layout\Row; use Dcat\Admin\Show; use Dcat\Admin\Widgets\Box; use Dcat\Admin\Widgets\Tab; -use Illuminate\Support\Facades\Request; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Request as RequestFacades; class UserController extends AdminController { @@ -196,7 +198,21 @@ class UserController extends AdminController $form->display('created_at'); $form->display('updated_at'); - $form->hidden('register_ip')->value(Request::getClientIp()); + $form->hidden('register_ip')->value(RequestFacades::getClientIp()); }); } + + public function users(Request $request) + { + $phone = $request->input('q'); + + $query = UserModel::select('id', 'phone as text'); + + if ($phone) { + $query->where('phone', 'like', "%$phone%"); + return $query->paginate(null); + } + + return response()->json($query->get()); + } } diff --git a/app/Admin/Controllers/WalletLogController.php b/app/Admin/Controllers/WalletLogController.php new file mode 100644 index 00000000..182d00e5 --- /dev/null +++ b/app/Admin/Controllers/WalletLogController.php @@ -0,0 +1,89 @@ +tools(function (Grid\Tools $tools) { + $tools->append(new Recharge()); + $tools->append(new Deduction()); + }); + // $grid->column('id')->sortable(); + $grid->column('user.phone')->copyable(); + $grid->column('remarks'); + $grid->column('change_balance')->display(function ($value) { + return bcdiv($value, 100, 2); + }); + $grid->column('before_balance')->display(function ($value) { + return bcdiv($value, 100, 2); + }); + + $grid->column('created_at')->sortable(); + // $grid->column('updated_at')->sortable(); + + $grid->model()->orderBy('created_at', 'desc'); + + $grid->disableActions(); + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(false); + $filter->equal('user.phone')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new WalletLog(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('before_balance'); + $show->field('change_balance'); + $show->field('remarks'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new WalletLog(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('before_balance'); + $form->text('change_balance'); + $form->text('remarks'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Extensions/Grid/Tools/Balance/Deduction.php b/app/Admin/Extensions/Grid/Tools/Balance/Deduction.php new file mode 100644 index 00000000..0bc9802e --- /dev/null +++ b/app/Admin/Extensions/Grid/Tools/Balance/Deduction.php @@ -0,0 +1,54 @@ +can('dcat.admin.balance_logs.deduction'); + } + + /** + * 按钮样式定义,默认 btn btn-white waves-effect + * + * @var string + */ + protected $style = 'btn btn btn-danger'; + + /** + * 按钮文本 + * + * @return string|void + */ + public function title() + { + return '扣减'; + } + + public function render() + { + $form = BalanceDeduction::make(); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->html()); + } + + /** + * 设置请求参数 + * + * @return array|void + */ + public function parameters() + { + return [ + + ]; + } +} diff --git a/app/Admin/Extensions/Grid/Tools/Balance/Recharge.php b/app/Admin/Extensions/Grid/Tools/Balance/Recharge.php new file mode 100644 index 00000000..6e223e81 --- /dev/null +++ b/app/Admin/Extensions/Grid/Tools/Balance/Recharge.php @@ -0,0 +1,54 @@ +can('dcat.admin.balance_logs.recharge'); + } + + /** + * 按钮样式定义,默认 btn btn-white waves-effect + * + * @var string + */ + protected $style = 'btn btn btn-warning'; + + /** + * 按钮文本 + * + * @return string|void + */ + public function title() + { + return '充值'; + } + + public function render() + { + $form = BalanceRecharge::make(); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->html()); + } + + /** + * 设置请求参数 + * + * @return array|void + */ + public function parameters() + { + return [ + + ]; + } +} diff --git a/app/Admin/Extensions/Grid/Tools/Wallet/Deduction.php b/app/Admin/Extensions/Grid/Tools/Wallet/Deduction.php new file mode 100644 index 00000000..237a5ac0 --- /dev/null +++ b/app/Admin/Extensions/Grid/Tools/Wallet/Deduction.php @@ -0,0 +1,54 @@ +can('dcat.admin.wallet_logs.deduction'); + } + + /** + * 按钮样式定义,默认 btn btn-white waves-effect + * + * @var string + */ + protected $style = 'btn btn btn-danger'; + + /** + * 按钮文本 + * + * @return string|void + */ + public function title() + { + return '扣减'; + } + + public function render() + { + $form = WalletDeduction::make(); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->html()); + } + + /** + * 设置请求参数 + * + * @return array|void + */ + public function parameters() + { + return [ + + ]; + } +} diff --git a/app/Admin/Extensions/Grid/Tools/Wallet/Recharge.php b/app/Admin/Extensions/Grid/Tools/Wallet/Recharge.php new file mode 100644 index 00000000..790901f3 --- /dev/null +++ b/app/Admin/Extensions/Grid/Tools/Wallet/Recharge.php @@ -0,0 +1,54 @@ +can('dcat.admin.wallet_logs.recharge'); + } + + /** + * 按钮样式定义,默认 btn btn-white waves-effect + * + * @var string + */ + protected $style = 'btn btn btn-warning'; + + /** + * 按钮文本 + * + * @return string|void + */ + public function title() + { + return '充值'; + } + + public function render() + { + $form = WalletRecharge::make(); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->html()); + } + + /** + * 设置请求参数 + * + * @return array|void + */ + public function parameters() + { + return [ + + ]; + } +} diff --git a/app/Admin/Forms/BalanceDeduction.php b/app/Admin/Forms/BalanceDeduction.php new file mode 100644 index 00000000..77b533fb --- /dev/null +++ b/app/Admin/Forms/BalanceDeduction.php @@ -0,0 +1,71 @@ +can('dcat.admin.wallet_logs.deduction'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + if (($input['change_balance']??0) <=0) { + return $this->response()->error('扣减金额必须大于0'); + } + try { + DB::beginTransaction(); + //获取当前操作人; + $adminUser = Admin::user(); + $user = User::findOrFail($input['user_id']??0); + $balanceService = new BalanceService(); + $balanceService->changeBalance($user, -($input['change_balance']??0), BalanceLog::ACTION_ADMIN_DEDUCTION, '后台扣减', $adminUser); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败:'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $this->select('user_id', '用户手机号')->ajax(admin_route('api.users'))->required(); + $this->currency('change_balance', '扣减金额')->symbol('¥')->default(0)->saving(function ($value) { + return bcmul($value, 100); + })->required(); + $this->confirm('是否确认扣减可提?', '提交后该动作无法逆转'); + } +} diff --git a/app/Admin/Forms/BalanceRecharge.php b/app/Admin/Forms/BalanceRecharge.php new file mode 100644 index 00000000..c796ff96 --- /dev/null +++ b/app/Admin/Forms/BalanceRecharge.php @@ -0,0 +1,71 @@ +can('dcat.admin.wallet_logs.recharge'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + if (($input['change_balance']??0) <=0) { + return $this->response()->error('充值金额必须大于0'); + } + try { + DB::beginTransaction(); + //获取当前操作人; + $adminUser = Admin::user(); + $user = User::findOrFail($input['user_id']??0); + $balanceService = new BalanceService(); + $balanceService->changeBalance($user, $input['change_balance']??0, BalanceLog::ACTION_ADMIN_RECHARGE, '后台充值', $adminUser); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败:'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $this->select('user_id', '用户手机号')->ajax(admin_route('api.users'))->required(); + $this->currency('change_balance', '充值金额')->symbol('¥')->default(0)->saving(function ($value) { + return bcmul($value, 100); + })->required(); + $this->confirm('是否确认充值余额?', '提交后该动作无法逆转'); + } +} diff --git a/app/Admin/Forms/WalletDeduction.php b/app/Admin/Forms/WalletDeduction.php new file mode 100644 index 00000000..50f0b02c --- /dev/null +++ b/app/Admin/Forms/WalletDeduction.php @@ -0,0 +1,71 @@ +can('dcat.admin.wallet_logs.deduction'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + if (($input['change_balance']??0) <=0) { + return $this->response()->error('扣减金额必须大于0'); + } + try { + DB::beginTransaction(); + //获取当前操作人; + $adminUser = Admin::user(); + $user = User::findOrFail($input['user_id']??0); + $walletService = new WalletService(); + $walletService->changeBalance($user, -($input['change_balance']??0), WalletLog::ACTION_ADMIN_DEDUCTION, '后台扣减', $adminUser); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败:'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $this->select('user_id', '用户手机号')->ajax(admin_route('api.users'))->required(); + $this->currency('change_balance', '扣减金额')->symbol('¥')->default(0)->saving(function ($value) { + return bcmul($value, 100); + })->required(); + $this->confirm('是否确认扣减可提?', '提交后该动作无法逆转'); + } +} diff --git a/app/Admin/Forms/WalletRecharge.php b/app/Admin/Forms/WalletRecharge.php new file mode 100644 index 00000000..4baca877 --- /dev/null +++ b/app/Admin/Forms/WalletRecharge.php @@ -0,0 +1,71 @@ +can('dcat.admin.wallet_logs.recharge'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + if (($input['change_balance']??0) <=0) { + return $this->response()->error('充值金额必须大于0'); + } + try { + DB::beginTransaction(); + //获取当前操作人; + $adminUser = Admin::user(); + $user = User::findOrFail($input['user_id']??0); + $walletService = new WalletService(); + $walletService->changeBalance($user, $input['change_balance']??0, WalletLog::ACTION_ADMIN_RECHARGE, '后台充值', $adminUser); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败:'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $this->select('user_id', '用户手机号')->ajax(admin_route('api.users'))->required(); + $this->currency('change_balance', '充值金额')->symbol('¥')->default(0)->saving(function ($value) { + return bcmul($value, 100); + })->required(); + $this->confirm('是否确认充值可提?', '提交后该动作无法逆转'); + } +} diff --git a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php index fe75be33..d2475129 100644 --- a/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php +++ b/app/Admin/Renderable/DistributionPreIncomeSimpleTable.php @@ -15,11 +15,7 @@ class DistributionPreIncomeSimpleTable extends LazyRenderable $builder->with('logs')->where('user_id', $userId); return Grid::make($builder, function (Grid $grid) { $grid->column('remarks', '备注'); - $grid->column('status', '状态')->using([ - 0=>'未结算', - 1=>'结算中', - 2=>'已结算', - ])->dot([ + $grid->column('status', '状态')->using(DistributionPreIncome::$statusTexts)->dot([ 0=>'danger', 1=>'danger', 2=>'success', diff --git a/app/Admin/Repositories/BalanceLog.php b/app/Admin/Repositories/BalanceLog.php new file mode 100644 index 00000000..95bee1fc --- /dev/null +++ b/app/Admin/Repositories/BalanceLog.php @@ -0,0 +1,16 @@ +names('wallet_to_bank_logs'); + $router->resource('distribution-pre-incomes', 'DistributionPreIncomeController')->only([ + 'index', + ])->names('distribution_pre_incomes'); + + $router->resource('wallet-logs', 'WalletLogController')->only([ + 'index', + ])->names('wallet_logs'); + + $router->resource('balance-logs', 'BalanceLogController')->only([ + 'index', + ])->names('balance_logs'); + /** api接口 **/ $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories'); $router->get('api/product-group-details', 'ProductGroupController@details')->name('api.product_group_details'); @@ -131,4 +143,5 @@ Route::group([ $router->get('api/coupone-send-tasks', 'CouponSendTaskController@tasks')->name('api.coupon_send_tasks'); $router->get('api/orders', 'OrderController@orders')->name('api.orders'); $router->get('api/order-products', 'OrderController@orderProducts')->name('api.order_products'); + $router->get('api/users', 'UserController@users')->name('api.users'); }); diff --git a/app/Models/BalanceLog.php b/app/Models/BalanceLog.php index 7e1769b5..952ea4ba 100644 --- a/app/Models/BalanceLog.php +++ b/app/Models/BalanceLog.php @@ -17,6 +17,8 @@ class BalanceLog extends Model public const ACTION_WALLET_IN = 4; public const ACTION_TRANSFER_OUT = 5; public const ACTION_TRANSFER_IN = 6; + public const ACTION_ADMIN_RECHARGE = 7; + public const ACTION_ADMIN_DEDUCTION = 8; /** * @var array @@ -31,6 +33,11 @@ class BalanceLog extends Model 'remarks', ]; + public function user() + { + return $this->belongsTo(User::class); + } + /** * 转账记录 * diff --git a/app/Models/DistributionPreIncome.php b/app/Models/DistributionPreIncome.php index b59a6890..b9dfe095 100644 --- a/app/Models/DistributionPreIncome.php +++ b/app/Models/DistributionPreIncome.php @@ -92,6 +92,14 @@ class DistributionPreIncome extends Model return $this->belongsTo(User::class); } + /** + * 此预收益的所属订单 + */ + public function order() + { + return $this->belongsTo(Order::class); + } + /** * 此预收益的变更记录 */ @@ -99,4 +107,14 @@ class DistributionPreIncome extends Model { return $this->hasMany(DistributionPreIncomeLog::class, 'pre_income_id'); } + + /** + * 等级名称 + * + * @return void + */ + public function getAgentLevelNameAttribute() + { + return UserInfo::$agentLevelTexts[$this->agent_level] ?? '未知'; + } } diff --git a/app/Models/WalletLog.php b/app/Models/WalletLog.php index 12b915d1..7e2a6071 100644 --- a/app/Models/WalletLog.php +++ b/app/Models/WalletLog.php @@ -17,6 +17,8 @@ class WalletLog extends Model public const ACTION_WITHDRAW_BANK = 4; public const ACTION_WITHDRAW_BALACNE = 5; public const ACTION_WITHDRAW_FAILED = 6; + public const ACTION_ADMIN_RECHARGE = 7; + public const ACTION_ADMIN_DEDUCTION = 8; public const ACTION_DISTRIBUTION_PRE_INCOME = 10; /** @@ -32,6 +34,16 @@ class WalletLog extends Model 'remarks', ]; + /** + * 此提现关联的用户 + * + * @return void + */ + public function user() + { + return $this->belongsTo(User::class); + } + /** * 提现到余额的明细 * diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 78c19cef..f03386a3 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -41,6 +41,7 @@ class AppServiceProvider extends ServiceProvider 'wallet_to_bank_log' => \App\Models\WalletToBankLog::class, 'balance_log' => \App\Models\BalanceLog::class, 'distribution_pre_income' => \App\Models\DistributionPreIncome::class, + 'admin_users' => \App\Models\Admin\Administrator::class, ]); JsonResource::withoutWrapping(); diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index eb326268..70ebda1f 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -217,6 +217,26 @@ class AdminMenuSeeder extends Seeder 'icon' => 'fa fa-jpy', 'uri'=> '', 'children'=>[ + [ + 'title' =>'预收益', + 'icon' => '', + 'uri' => 'distribution-pre-incomes', + ], + [ + 'title' => '可提账户', + 'icon'=>'', + 'uri' => 'wallet-logs', + ], + [ + 'title' => '余额账户', + 'icon' => '', + 'uri' => 'balance-logs', + ], + [ + 'title' => '积分账户', + 'icon' => '', + 'uri' => 'points-logs', + ], [ 'title' =>'提现审核', 'icon' => '', diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 163ca002..d5d241d5 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -61,6 +61,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection amount * @property Grid\Column|Collection state * @property Grid\Column|Collection tracking_number + * @property Grid\Column|Collection sales_value * @property Grid\Column|Collection v * @property Grid\Column|Collection cate * @property Grid\Column|Collection is_force @@ -89,6 +90,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection total_expenses * @property Grid\Column|Collection total_revenue * @property Grid\Column|Collection transferable + * @property Grid\Column|Collection is_frozen * @property Grid\Column|Collection continue_click_times * @property Grid\Column|Collection last_click_at * @property Grid\Column|Collection coupon_id @@ -152,7 +154,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection after_expire_at * @property Grid\Column|Collection remain_quantity * @property Grid\Column|Collection gift_for_sku_id - * @property Grid\Column|Collection sales_value * @property Grid\Column|Collection max * @property Grid\Column|Collection reason * @property Grid\Column|Collection user_coupon_id @@ -166,6 +167,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection shipping_state * @property Grid\Column|Collection is_change * @property Grid\Column|Collection out_trade_no + * @property Grid\Column|Collection auto_complete_at * @property Grid\Column|Collection payable_type * @property Grid\Column|Collection payable_id * @property Grid\Column|Collection tokenable_type @@ -229,6 +231,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection quota_v2 * @property Grid\Column|Collection quota_v1 * @property Grid\Column|Collection group_sales_value + * @property Grid\Column|Collection pre_growth_value * @property Grid\Column|Collection vip_id * @property Grid\Column|Collection phone_verified_at * @property Grid\Column|Collection email @@ -237,6 +240,9 @@ namespace Dcat\Admin { * @property Grid\Column|Collection last_login_at * @property Grid\Column|Collection register_ip * @property Grid\Column|Collection status_remark + * @property Grid\Column|Collection rate + * @property Grid\Column|Collection service_amount + * @property Grid\Column|Collection account_amount * @property Grid\Column|Collection withdrawable * * @method Grid\Column|Collection id(string $label = null) @@ -289,6 +295,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection amount(string $label = null) * @method Grid\Column|Collection state(string $label = null) * @method Grid\Column|Collection tracking_number(string $label = null) + * @method Grid\Column|Collection sales_value(string $label = null) * @method Grid\Column|Collection v(string $label = null) * @method Grid\Column|Collection cate(string $label = null) * @method Grid\Column|Collection is_force(string $label = null) @@ -317,6 +324,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection total_expenses(string $label = null) * @method Grid\Column|Collection total_revenue(string $label = null) * @method Grid\Column|Collection transferable(string $label = null) + * @method Grid\Column|Collection is_frozen(string $label = null) * @method Grid\Column|Collection continue_click_times(string $label = null) * @method Grid\Column|Collection last_click_at(string $label = null) * @method Grid\Column|Collection coupon_id(string $label = null) @@ -380,7 +388,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection after_expire_at(string $label = null) * @method Grid\Column|Collection remain_quantity(string $label = null) * @method Grid\Column|Collection gift_for_sku_id(string $label = null) - * @method Grid\Column|Collection sales_value(string $label = null) * @method Grid\Column|Collection max(string $label = null) * @method Grid\Column|Collection reason(string $label = null) * @method Grid\Column|Collection user_coupon_id(string $label = null) @@ -394,6 +401,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection shipping_state(string $label = null) * @method Grid\Column|Collection is_change(string $label = null) * @method Grid\Column|Collection out_trade_no(string $label = null) + * @method Grid\Column|Collection auto_complete_at(string $label = null) * @method Grid\Column|Collection payable_type(string $label = null) * @method Grid\Column|Collection payable_id(string $label = null) * @method Grid\Column|Collection tokenable_type(string $label = null) @@ -457,6 +465,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection quota_v2(string $label = null) * @method Grid\Column|Collection quota_v1(string $label = null) * @method Grid\Column|Collection group_sales_value(string $label = null) + * @method Grid\Column|Collection pre_growth_value(string $label = null) * @method Grid\Column|Collection vip_id(string $label = null) * @method Grid\Column|Collection phone_verified_at(string $label = null) * @method Grid\Column|Collection email(string $label = null) @@ -465,6 +474,9 @@ namespace Dcat\Admin { * @method Grid\Column|Collection last_login_at(string $label = null) * @method Grid\Column|Collection register_ip(string $label = null) * @method Grid\Column|Collection status_remark(string $label = null) + * @method Grid\Column|Collection rate(string $label = null) + * @method Grid\Column|Collection service_amount(string $label = null) + * @method Grid\Column|Collection account_amount(string $label = null) * @method Grid\Column|Collection withdrawable(string $label = null) */ class Grid {} @@ -522,6 +534,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection amount * @property Show\Field|Collection state * @property Show\Field|Collection tracking_number + * @property Show\Field|Collection sales_value * @property Show\Field|Collection v * @property Show\Field|Collection cate * @property Show\Field|Collection is_force @@ -550,6 +563,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection total_expenses * @property Show\Field|Collection total_revenue * @property Show\Field|Collection transferable + * @property Show\Field|Collection is_frozen * @property Show\Field|Collection continue_click_times * @property Show\Field|Collection last_click_at * @property Show\Field|Collection coupon_id @@ -613,7 +627,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection after_expire_at * @property Show\Field|Collection remain_quantity * @property Show\Field|Collection gift_for_sku_id - * @property Show\Field|Collection sales_value * @property Show\Field|Collection max * @property Show\Field|Collection reason * @property Show\Field|Collection user_coupon_id @@ -627,6 +640,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection shipping_state * @property Show\Field|Collection is_change * @property Show\Field|Collection out_trade_no + * @property Show\Field|Collection auto_complete_at * @property Show\Field|Collection payable_type * @property Show\Field|Collection payable_id * @property Show\Field|Collection tokenable_type @@ -690,6 +704,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection quota_v2 * @property Show\Field|Collection quota_v1 * @property Show\Field|Collection group_sales_value + * @property Show\Field|Collection pre_growth_value * @property Show\Field|Collection vip_id * @property Show\Field|Collection phone_verified_at * @property Show\Field|Collection email @@ -698,6 +713,9 @@ namespace Dcat\Admin { * @property Show\Field|Collection last_login_at * @property Show\Field|Collection register_ip * @property Show\Field|Collection status_remark + * @property Show\Field|Collection rate + * @property Show\Field|Collection service_amount + * @property Show\Field|Collection account_amount * @property Show\Field|Collection withdrawable * * @method Show\Field|Collection id(string $label = null) @@ -750,6 +768,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection amount(string $label = null) * @method Show\Field|Collection state(string $label = null) * @method Show\Field|Collection tracking_number(string $label = null) + * @method Show\Field|Collection sales_value(string $label = null) * @method Show\Field|Collection v(string $label = null) * @method Show\Field|Collection cate(string $label = null) * @method Show\Field|Collection is_force(string $label = null) @@ -778,6 +797,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection total_expenses(string $label = null) * @method Show\Field|Collection total_revenue(string $label = null) * @method Show\Field|Collection transferable(string $label = null) + * @method Show\Field|Collection is_frozen(string $label = null) * @method Show\Field|Collection continue_click_times(string $label = null) * @method Show\Field|Collection last_click_at(string $label = null) * @method Show\Field|Collection coupon_id(string $label = null) @@ -841,7 +861,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection after_expire_at(string $label = null) * @method Show\Field|Collection remain_quantity(string $label = null) * @method Show\Field|Collection gift_for_sku_id(string $label = null) - * @method Show\Field|Collection sales_value(string $label = null) * @method Show\Field|Collection max(string $label = null) * @method Show\Field|Collection reason(string $label = null) * @method Show\Field|Collection user_coupon_id(string $label = null) @@ -855,6 +874,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection shipping_state(string $label = null) * @method Show\Field|Collection is_change(string $label = null) * @method Show\Field|Collection out_trade_no(string $label = null) + * @method Show\Field|Collection auto_complete_at(string $label = null) * @method Show\Field|Collection payable_type(string $label = null) * @method Show\Field|Collection payable_id(string $label = null) * @method Show\Field|Collection tokenable_type(string $label = null) @@ -918,6 +938,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection quota_v2(string $label = null) * @method Show\Field|Collection quota_v1(string $label = null) * @method Show\Field|Collection group_sales_value(string $label = null) + * @method Show\Field|Collection pre_growth_value(string $label = null) * @method Show\Field|Collection vip_id(string $label = null) * @method Show\Field|Collection phone_verified_at(string $label = null) * @method Show\Field|Collection email(string $label = null) @@ -926,6 +947,9 @@ namespace Dcat\Admin { * @method Show\Field|Collection last_login_at(string $label = null) * @method Show\Field|Collection register_ip(string $label = null) * @method Show\Field|Collection status_remark(string $label = null) + * @method Show\Field|Collection rate(string $label = null) + * @method Show\Field|Collection service_amount(string $label = null) + * @method Show\Field|Collection account_amount(string $label = null) * @method Show\Field|Collection withdrawable(string $label = null) */ class Show {} diff --git a/resources/lang/zh_CN/balance-log.php b/resources/lang/zh_CN/balance-log.php new file mode 100644 index 00000000..704aae6f --- /dev/null +++ b/resources/lang/zh_CN/balance-log.php @@ -0,0 +1,19 @@ + [ + 'BalanceLog' => '余额账户', + 'balance-logs' => '余额账户', + ], + 'fields' => [ + 'user_id' => '用户ID', + 'user'=>[ + 'phone' => '手机号', + ], + 'before_balance' => '变更前(¥)', + 'change_balance' => '变更金额(¥)', + 'remarks' => '备注', + ], + 'options' => [ + ], +]; diff --git a/resources/lang/zh_CN/distribution-pre-income.php b/resources/lang/zh_CN/distribution-pre-income.php new file mode 100644 index 00000000..189976d1 --- /dev/null +++ b/resources/lang/zh_CN/distribution-pre-income.php @@ -0,0 +1,28 @@ + [ + 'DistributionPreIncome' => '预收益', + 'distribution-pre-incomes' => '预收益', + ], + 'fields' => [ + 'user_id' => '用户ID', + 'order_id' => '订单ID', + 'type' => '收益类型', + 'agent_level' => '代理等级', + 'total_amount' => '总金额', + 'total_sales_value' => '总销售', + 'total_revenue' => '总收益', + 'status' => '状态', + 'remarks' => '备注', + 'completed_at' => '结算时间', + 'user'=>[ + 'phone'=>'手机号', + ], + 'order'=>[ + 'sn'=>'订单编号', + ], + ], + 'options' => [ + ], +]; diff --git a/resources/lang/zh_CN/wallet-log.php b/resources/lang/zh_CN/wallet-log.php new file mode 100644 index 00000000..3ed63536 --- /dev/null +++ b/resources/lang/zh_CN/wallet-log.php @@ -0,0 +1,19 @@ + [ + 'WalletLog' => '可提账户', + 'wallet-logs' => '可提账户', + ], + 'fields' => [ + 'user_id' => '用户ID', + 'user'=>[ + 'phone' => '手机号', + ], + 'before_balance' => '变更前(¥)', + 'change_balance' => '变更金额(¥)', + 'remarks' => '备注', + ], + 'options' => [ + ], +];