1.修正返利申请详情bug

2.加入自建邮局关闭验证的配置

app/Http/Controllers/AdminController.php

@@ -1797,11 +1797,7 @@ class AdminController extends Controller
         $apply = ReferralApply::query()->with(['user'])->where('id', $id)->first();
         if ($apply && $apply->link_logs) {
             $link_logs = explode(',', $apply->link_logs);
-            $list = ReferralLog::query()->whereIn('id', $link_logs)->with('user')->paginate(10);
-        }
-
-        foreach ($list as &$vo) {
-            $vo->goods = OrderGoods::query()->where('oid', $vo->order_id)->with('goods')->first();
+            $list = ReferralLog::query()->with(['user', 'order.goods'])->whereIn('id', $link_logs)->paginate(10);
         }
 
         $view['info'] = $apply;

app/Http/Controllers/RegisterController.php

@@ -212,6 +212,14 @@ class RegisterController extends Controller
 
                 $request->session()->flash('regSuccessMsg', '注册成功：激活邮件已发送，请查看邮箱');
             } else {
+                // 如果不需要激活，则直接给推荐人加流量
+                if ($referral_uid) {
+                    $transfer_enable = self::$config['referral_traffic'] * 1048576;
+
+                    User::query()->where('id', $referral_uid)->increment('transfer_enable', $transfer_enable);
+                    User::query()->where('id', $referral_uid)->update(['enable' => 1]);
+                }
+
                 $request->session()->flash('regSuccessMsg', '注册成功');
             }
 

app/Http/Controllers/UserController.php

@@ -634,9 +634,7 @@ class UserController extends Controller
             $transfer_enable = self::$config['referral_traffic'] * 1048576;
 
             User::query()->where('id', $verify->user->referral_uid)->increment('transfer_enable', $transfer_enable);
-
-            // TODO：写入流量增加日志
-
+            User::query()->where('id', $verify->user->referral_uid)->update(['enable' => 1]);
         }
 
         $request->session()->flash('successMsg', '账号激活成功');
@@ -1105,7 +1103,7 @@ class UserController extends Controller
 
         $view['website_analytics'] = self::$config['website_analytics'];
         $view['website_customer_service'] = self::$config['website_customer_service'];
-        $view['subscribe_status'] = $subscribe->status;
+        $view['subscribe_status'] = !$subscribe ? 1 : $subscribe->status;
         $view['link'] = self::$config['subscribe_domain'] ? self::$config['subscribe_domain'] . '/s/' . $code : self::$config['website_url'] . '/s/' . $code;
 
         return Response::view('/user/subscribe', $view);

app/Http/Models/ReferralLog.php

@@ -20,6 +20,11 @@ class ReferralLog extends Model
         return $this->hasOne(User::class, 'id', 'user_id');
     }
 
+    function order()
+    {
+        return $this->hasOne(Order::class, 'oid', 'order_id');
+    }
+
     function getAmountAttribute($value)
     {
         return $value / 100;

config/mail.php

@@ -120,4 +120,17 @@ return [
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | 注意：仅在自建邮局且PHP5.6+时使用
+    |--------------------------------------------------------------------------
+    */
+//    'stream'   => [
+//        'ssl' => [
+//            'verify_peer'       => false,
+//            'verify_peer_name'  => false,
+//            'allow_self_signed' => false,
+//        ],
+//    ],
+
 ];

resources/views/admin/applyDetail.blade.php

@@ -69,7 +69,7 @@
                                             <tr>
                                                 <td> {{$vo->id}} </td>
                                                 <td> {{$vo->user->username}} </td>
-                                                <td> {{$vo->goods->goods->name}}</td>
+                                                <td> {{$vo->order->goods->name}}</td>
                                                 <td> {{$vo->amount}} </td>
                                                 <td> {{$vo->ref_amount}} </td>
                                                 <td> {{$vo->created_at}} </td>