1

app/Http/Controllers/V1/PayController.php

@@ -86,27 +86,21 @@ class PayController extends Controller
 //            $trade_no = $params['trade_no'];
             $order = UserMemberOrder::query()->where('order_no','=',$out_trade_no)->first(); //查询订单信息
             $user = User::query()->where('id','=',$order->user_id)->first(); //查询用户信息
-
-            $user->nickname = time();
-            $user->start_time = time(); // 当前时间
             $end_time = $order->days * 86400; // 天数换取时间戳(会员结束时间)
-
-            $user->end_time = time() + $end_time; // 会员结束时间
-            $user->save();
             // 剩下会员时长
-//            if(!empty($user->end_time)){
-//                if($user->end_time > time()){
-//                    $user->end_time = strtotime($user->end_time) +  $end_time;
-//                }
-//            }else{
-//                $user->start_time = time(); // 当前时间
-//                $user->end_time = time() + $end_time; // 会员结束时间
-//            }
-//            $user->member_type = 2; // 变为企业会员
-//            $order->status = 1;
-//            $order->pay_time = time();
-//            $order->save();
-//            $user->save();
+            if(!empty($user->end_time)){
+                if(strtotime($user->end_time) > time()){
+                    $user->end_time = date("Y-m-d H:i:s",strtotime($user->end_time) +  $end_time);
+                }
+            }else{
+                $user->start_time = date("Y-m-d H:i:s",time()); // 当前时间
+                $user->end_time = date("Y-m-d H:i:s",time() + $end_time); // 会员结束时间
+            }
+            $user->member_type = 2; // 变为企业会员
+            $order->status = 1;
+            $order->pay_time = date("Y-m-d H:i:s",time());
+            $order->save();
+            $user->save();
             return 'success';
         } else {
             // 验证失败