Browse Source

add qapp package

onlinetest 5 years ago
parent
commit
18e2028f56

+ 2 - 3
app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -46,13 +46,12 @@ class UsersController extends Controller
      */
     public function index(Request $request)
     {
-        // $send_order_id = $request->header('send-order-id', 0);
+        $package = $request->input('package', '');
         $send_order_id = $request->input('send_order_id', 0);
-        myLog('test')->info('login.send_order_id:' . $send_order_id);
         $device_no = $request->input('device_no', '');
         $device_info = $request->input('device_info', '');
         if ($device_no) {
-            $data = QappUserService::loginStatic(compact('send_order_id', 'device_no', 'device_info'));
+            $data = QappUserService::loginStatic(compact('package', 'send_order_id', 'device_no', 'device_info'));
             return response()->success($data);
         } else {
             return response()->error('PARAM_ERROR');

+ 17 - 0
app/Modules/User/Models/QappPackage.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Modules\User\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class QappPackage extends Model
+{
+    protected $table = 'qapp_package_info';
+
+    protected $fillable =
+    [
+        'package',
+        'channel_id',
+        'company',
+    ];
+}

+ 12 - 1
app/Modules/User/Services/QappUserService.php

@@ -5,6 +5,7 @@ namespace App\Modules\User\Services;
 
 use App\Consts\SysConsts;
 use App\Modules\BaseService;
+use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
 use App\Modules\User\Models\User;
 use DB;
@@ -140,6 +141,16 @@ class QappUserService
         }
     }
 
+    private function findChannelId(string $package)
+    {
+        $channel_id = env('QUICKAPP_SITE');
+        if ($package) {
+            $package_info = QappPackage::where('package', $package)->first();
+            $channel_id = $package_info ? $package_info->channel_id : $channel_id;
+        }
+        return $channel_id;
+    }
+
     /**
      * 创建用户
      */
@@ -148,7 +159,7 @@ class QappUserService
         $openid = $data['device_no'];
         $unionid = $data['device_no'];
         $register_ip = _getIp();
-        $distribution_channel_id = env('QUICKAPP_SITE');
+        $distribution_channel_id = $this->findChannelId($data['package']);
         $send_order_id = $data['send_order_id'];
         $unique_key = compact('unionid', 'distribution_channel_id');
         $data = compact('openid', 'register_ip', 'send_order_id');