Merge branch 'stabble' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/User/ReadRecordController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Wap\User;
 
 use App\Modules\Cpa\Services\AdvertiseUserQueueService;
+use App\Modules\ShareFree\Services\ShareUsersService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Wap\BaseController;
 use App\Modules\Book\Services\BookConfigService;
@@ -106,7 +107,7 @@ class ReadRecordController extends BaseController
         $res = json_encode($res);
         $res = json_decode($res);
         foreach ($res as $key=>&$each){
-            $rec = AdvertiseUserQueueService::getUserAdvertiseSubscribe($this->uid,$each->bid);
+            $rec = ShareUsersService::getUnlocked($this->uid,$each->bid);// ($this->uid,$each->bid);
             if($rec) {
                 $each->is_advertise_sub=1;
             }else {

app/Modules/ShareFree/Models/ShareUsers.php

@@ -22,4 +22,8 @@ class ShareUsers extends Model
         }
         return $rec;
     }
+
+    public static function getUnlocked($uid,$bid) {
+        return self::where('uid',$uid)->where('bid',$bid)->where('status',1)->first();
+    }
 }

app/Modules/ShareFree/Services/ShareUsersService.php

@@ -14,4 +14,8 @@ class ShareUsersService
     public static function addShareUsers($data) {
         return ShareUsers::addShareUsers($data);
     }
+
+    public static function getUnlocked($uid,$bid){
+        return ShareUsers::getUnlocked($uid,$bid);
+    }
 }