OnePoem / OnePoem-Server

Go to a project
Toggle navigation Toggle navigation pinning
李帅
3073f8bf 1 parent 535459c5

1.打印苹果日志

Inline Side-by-side
Showing 3 changed files with 24 additions and 8 deletions
...@@ -31,7 +31,7 @@ class Controller extends BaseController ...@@ -31,7 +31,7 @@ class Controller extends BaseController
31 }else if (strpos($ua, 'Android') || strpos($ua, 'android')){ 31 }else if (strpos($ua, 'Android') || strpos($ua, 'android')){
32 return 'android'; 32 return 'android';
33 }else{ 33 }else{
34 - Log::error("user-agent:".$ua); 34 + Log::error("user-agent:" . $ua);
35 return 'unkown'; 35 return 'unkown';
36 } 36 }
37 } 37 }
......
...@@ -20,7 +20,9 @@ class MembershipController extends Controller ...@@ -20,7 +20,9 @@ class MembershipController extends Controller
20 $user = $request->user(); 20 $user = $request->user();
21 $profile = UserProfile::query()->find($user->id); 21 $profile = UserProfile::query()->find($user->id);
22 22
23 - if ($profile != null && $profile->is_vip == 1) { 23 + if ($profile == null) return Response::fail('未找到改用户');
24 +
25 + if ($profile->is_vip == UserProfile::IS_VIP) {
24 $state = 2; // 会员显示 26 $state = 2; // 会员显示
25 }else{ 27 }else{
26 $state = 1; // 非会员显示 28 $state = 1; // 非会员显示
...@@ -39,15 +41,21 @@ class MembershipController extends Controller ...@@ -39,15 +41,21 @@ class MembershipController extends Controller
39 41
40 $membership->bg_images = $membership->getImage(); 42 $membership->bg_images = $membership->getImage();
41 43
42 - if ($profile->is_vip == 1){ 44 + if ($profile->is_vip == UserProfile::IS_VIP) {
43 // 会员显示 45 // 会员显示
44 - $membership->is_vip = 1; 46 + $membership->is_vip = UserProfile::IS_VIP;
45 - $membership->create_vip_time = $profile->create_vip_time; 47 + $membership->create_vip_time = $profile->create_vip_time;
46 - $membership->expire_vip_time = $profile->expire_vip_time; 48 + $membership->expire_vip_time = $profile->expire_vip_time;
47 - $membership->goods_list = []; 49 + $membership->goods_list = [];
50 + }elseif ($profile->is_vip == UserProfile::WAIT_VIP){
51 + // 非会员显示
52 + $membership->is_vip = UserProfile::WAIT_VIP;
53 + $membership->create_vip_time = '';
54 + $membership->expire_vip_time = '';
55 + $membership->goods_list = $membership->getMembershipGoods()->get();
48 }else{ 56 }else{
49 // 非会员显示 57 // 非会员显示
50 - $membership->is_vip = 0; 58 + $membership->is_vip = UserProfile::NO_VIP;
51 $membership->create_vip_time = ''; 59 $membership->create_vip_time = '';
52 $membership->expire_vip_time = ''; 60 $membership->expire_vip_time = '';
53 $membership->goods_list = $membership->getMembershipGoods()->get(); 61 $membership->goods_list = $membership->getMembershipGoods()->get();
......
...@@ -54,6 +54,14 @@ class GooglePayment implements PaymentInterface ...@@ -54,6 +54,14 @@ class GooglePayment implements PaymentInterface
54 54
55 public function verify(Order $order, $token) 55 public function verify(Order $order, $token)
56 { 56 {
57 + // 绑定order 和 originalTransactionId
58 + $order->status = Order::PAID;
59 + $order->save();
60 +
61 + // 修改用户状态
62 + $profile = UserProfile::query()->find($order->user_id);
63 + $profile->is_vip = UserProfile::WAIT_VIP;
64 + $profile->save();
57 return true; 65 return true;
58 } 66 }
59 67
......