调试优化

app/Admin/Controllers/UserMemberController.php

@@ -20,17 +20,20 @@ class UserMemberController extends AdminController
         return Grid::make(new UserMember(), function (Grid $grid) {
             $grid->column('id')->sortable();
             $grid->column('title');
+            $grid->column('type')->display(function (){
+                if($this->type == 1){
+                    return '连续包月';
+                }else{
+                    return '一次性支付';
+                }
+            })->label();
             $grid->column('describe');
             $grid->column('money');
+            $grid->column('month');
             $grid->column('updated_at')->sortable();
             $grid->disableFilter();
-            $grid->disableCreateButton();
             $grid->disableViewButton();
-            // 禁用删除按钮
-            $grid->disableDeleteButton();
-            $grid->disableBatchDelete();
             $grid->actions(function (Grid\Displayers\Actions $actions) {
-                $actions->disableDelete();
                 $actions->disableQuickEdit();
                 $actions->disableView();
             });
@@ -65,14 +68,16 @@ class UserMemberController extends AdminController
     protected function form()
     {
         return Form::make(new UserMember(), function (Form $form) {
-            $id = $form->getKey();
             $form->display('id')->width(4);
-            $form->text('title')->width(4);
+            $form->radio('type')->options([
+                    1 => '连续包月',
+                    2 => '一次性支付',
+                ])->default(1);
+            $form->text('title')->width(4)->required();
             $form->text('describe')->width(4);
-            if($id == 2){
-                $form->decimal('money')->width(4);
-            }
-            $form->editor('content')->width(4);
+            $form->decimal('money')->width(4)->required();
+            $form->number('month')->min(1)->width(4)->default(1)->required();
+//            $form->editor('content');
             $form->disableViewButton();
             $form->disableDeleteButton();
         });

app/Admin/Controllers/UserMemberOrderController.php

@@ -18,7 +18,7 @@ class UserMemberOrderController extends AdminController
     protected function grid()
     {
         return Grid::make(new UserMemberOrder(), function (Grid $grid) {
-            $grid->model()->with('user:id,name,company_name,avatar');
+            $grid->model()->with('user:id,name,company_name,avatar')->orderByDesc('id');
             $grid->column('id')->sortable();
             $grid->column('user_id')->display(function (){
                 $str = '';

app/Http/Controllers/V1/MemberController.php

@@ -46,22 +46,13 @@ class MemberController extends Controller
         DB::beginTransaction();
         try {
             $user = User::query()->where('id',$this->userId)->first();
-            $data = [
-                'user_id' => $this->userId,
-                'days' => 30,// 续费时间 = 默认一个月30天
-                'pay_type'=>0,
-                'status'=>0,
-                'order_no' => date('YmdHis') . str_pad(mt_rand(1, 999), 3, '0', STR_PAD_LEFT), // 订单号
-                'money' => UserMember::query()->where('id',2)->value('money') // 续费金额
-            ];
-            $order = UserMemberOrder::query()->create($data);
             $user->update($params);
             DB::commit();
         } catch (\Exception $e){
             DB::rollBack();
            return $this->error("保存失败！");
         }
-       return $this->success($order);
+       return $this->success();
     }
 
     /**

app/Http/Controllers/V1/PayController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\V1;
 use App\Models\User;
+use App\Models\UserMember;
 use App\Models\UserMemberOrder;
 use Illuminate\Http\Request;
 
@@ -17,7 +18,6 @@ class PayController extends Controller
     {
         $this->user = auth('api')->user();
         $this->userId = $this->user ? $this->user->id : 0;
-
         //如果用户被删除，会自动退出登录
         if (!empty($this->user->deleted_at)) {
             $this->user->online = 0;
@@ -42,20 +42,34 @@ class PayController extends Controller
      * 构建支付
      */
     public function payment(Request $request){
-        $order_id = $request->get('order_id');
+        $member_id = $request->get('member_id');
         $pay_type = $request->get('pay_type');
-        if(!$order_id || !$pay_type){
+        $money = $request->get('money');
+        if(!$money || !$pay_type || !$member_id){
             return $this->error("缺少参数！");
         }
-        $order = UserMemberOrder::query()->where('id',$order_id)->first();
+        $member = UserMember::query()->where('id',$member_id)->first();
+        if(!$member){
+            return $this->error("购买选项不存在！");
+        }
+        $data = [
+            'user_id' => $this->userId,
+            'days' => $member->month * 30,// 续费时间 = 月份 * 默认一个月30天
+            'pay_type' => $pay_type,
+            'status' => 0,
+            'order_no' => date('YmdHis') . str_pad(mt_rand(1, 999), 3, '0', STR_PAD_LEFT), // 订单号
+            'money' => $member->money // 续费金额
+        ];
+        $order = UserMemberOrder::query()->create($data);
         if(!$order){
-            return $this->error("订单不存在！");
+            return $this->error("操作失败！");
+        }
+        if($pay_type == 1){ // 支付宝支付
+            $result = Factory::payment()->page()->pay("加入企业会员",$order->order_no,intval($order->money),'');
+            return $this->success($result->body);
+        }else{
+            return $this->error("正在开发中...");
         }
-        $order->pay_type = $pay_type; // 支付方式
-        $order->save();
-        $result = Factory::payment()->page()->pay("加入企业会员",$order->order_no,0.01,'');
-        dd($result);
-        return $this->success($result->body);
     }
 
     /**

app/Models/User.php

@@ -34,7 +34,7 @@ class User extends Authenticatable implements JWTSubject
         'last_login_time',
         'is_counting',
         'is_cashier',
-        'member_id',
+        'member_type',
         'company_image',
         'company_card_color',
         'company_name',
@@ -51,15 +51,15 @@ class User extends Authenticatable implements JWTSubject
     }
 
     protected $appends =[
-        'member_id_text',
+        'member_type_text',
     ];
-    public function getMemberIdTextAttribute()
+    public function getMemberTypeTextAttribute()
     {
         $list = $this->memberStatus();
-        if(empty($this->attributes['member_id'])){
+        if(empty($this->attributes['member_type'])){
             return null;
         }
-        return isset($list[$this->attributes['member_id']]) ? $list[$this->attributes['member_id']] : '';
+        return isset($list[$this->attributes['member_type']]) ? $list[$this->attributes['member_type']] : '';
     }
 
     //protected $guarded = [];

resources/lang/zh/menu.php

@@ -23,7 +23,7 @@ return [
         'problem_type' => '问题类型',
         'problem_list' => '问题列表',
         'system_settings' => '系统设置',
-        'user_member' => '会员类型',
+        'user_member' => '会员价格',
         'user_member_order' => '续费订单',
         'reports' => '举报',
         'report' => '举报问题',

resources/lang/zh/user-member.php

@@ -1,14 +1,15 @@
 <?php
 return [
     'labels' => [
-        'UserMember' => '会员类型',
-        'user_member' => '会员类型',
+        'UserMember' => '会员价格',
+        'user_member' => '会员价格',
     ],
     'fields' => [
-        'title' => '会员标题',
-        'describe' => '会员描述',
+        'title' => '标题',
+        'describe' => '描述',
         'money' => '金额',
         'content' => '内容',
+        'month'=> '月份'
     ],
     'options' => [
     ],