阶段更新

modules/User/Http/Controllers/Admin/Actions/JoinIdentity.php

@@ -5,9 +5,10 @@ namespace Modules\User\Http\Controllers\Admin\Actions;
 use Encore\Admin\Actions\Response;
 use Encore\Admin\Actions\RowAction;
 use Exception;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Modules\User\Models\Identity;
+use Modules\User\Models\Order;
+use Modules\User\Models\User;
 
 class JoinIdentity extends RowAction
 {
@@ -38,11 +39,6 @@ class JoinIdentity extends RowAction
             $order = Order::create($data);
             $order->pay();
 
-//
-//            $user->joinIdentity($identity_id, 'System', [
-//                'remark' => $remark,
-//            ]);
-
             return $this->response()->success('加入身份成功')->refresh();
         } catch (Exception $e) {
             return $this->response()->error($e->getMessage())->refresh();
@@ -52,13 +48,9 @@ class JoinIdentity extends RowAction
     public function form(User $user)
     {
         $userIdentity = $user->identityFirst();
-        if (empty($userIdentity)) {
-            $identities = Identity::whereIn('order', [2, 3, 4, 5])->pluck('name', 'id');
-        } elseif ($userIdentity->job == Identity::JOB_YK) {
-            $identities = Identity::whereIn('order', [2, 3, 4, 5])->pluck('name', 'id');
-        } else {
-            $identities = Identity::where('order', '>', $userIdentity->order)->pluck('name', 'id');
-        }
+
+        $identities = Identity::where('order', '>', $userIdentity->order)->pluck('name', 'id');
+
         $this->select('join_identity_id', '加入身份')
             ->options($identities)
             ->required();

modules/User/Http/Controllers/Admin/IdentitiesController.php

@@ -136,11 +136,7 @@ class IdentitiesController extends AdminController
             ->default(1);
         $form->radioButton('job', '身份')
             ->options(Identity::JOBS)
-            ->default(0)
-            ->when(Identity::JOB_TY, function (Form $form) {
-                $form->number('total', '可开通总数')->default(100);
-                $form->date('end_at', '结束日期');
-            });
+            ->default(0);
         $form->divider();
 
         $form->table('conditions', '升级条件', function (NestedForm $form) {

modules/User/Http/Controllers/Admin/IndexController.php

@@ -11,7 +11,9 @@ use Illuminate\Support\Facades\DB;
 use Modules\User\Http\Controllers\Admin\Actions\JoinIdentity;
 use Modules\User\Http\Controllers\Admin\Actions\RemoveIdentity;
 use Modules\User\Http\Controllers\Admin\Actions\UpdateRelation;
+use Modules\User\Models\Identity;
 use Modules\User\Models\User;
+use Vinkla\Hashids\Facades\Hashids;
 
 class IndexController extends AdminController
 {

modules/User/Http/Controllers/Admin/OrderController.php

@@ -3,9 +3,12 @@
 namespace Modules\User\Http\Controllers\Admin;
 
 use Encore\Admin\Controllers\AdminController;
+use Encore\Admin\Form;
 use Encore\Admin\Grid;
 use Exception;
 use Modules\User\Http\Controllers\Admin\Actions\Pay;
+use Modules\User\Http\Controllers\Admin\Actions\Refund;
+use Modules\User\Models\Identity;
 use Modules\User\Models\Order;
 
 class OrderController extends AdminController
@@ -67,7 +70,7 @@ class OrderController extends AdminController
             $grid->column('price', '应打款额')->editable();
             $grid->column('state', '状态')->using(Order::STATES)->label();
             $grid->column('type', '类型')->using(Order::TYPES)->label();
-            
+
             $grid->column('created_at', '升级时间');
 
             return $grid;

modules/User/Http/Controllers/Admin/StockController.php

@@ -5,7 +5,6 @@ namespace Modules\User\Http\Controllers\Admin;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Grid;
 use Modules\User\Models\UserStock;
-use Modules\User\Models\UserStockLog;
 
 class StockController extends AdminController
 {
@@ -43,7 +42,7 @@ class StockController extends AdminController
             });
 
         $grid->column('stock', '总数');
-        $grid->column('hold', '提货数')
+        $grid->column('logs_count', '变动记录')
             ->link(function () {
                 return admin_url('/users/stocks/'.$this->id.'/logs');
             }, '_blank');