Merge branch 'ad-tu' of iqiyoo:zhuishuyun_wap into stabble

app/Http/Controllers/Wap/Advertises/AdvertiseController.php

@@ -76,7 +76,7 @@ class AdvertiseController extends BaseController
             'bid'=>$bid,
             'ad_user_id'=>$AdUers->id,
             'advertise_id'=>$ad,
-            'add_time'=>time(),
+            //'add_time'=>time(),
             'status'=>0
         );
         AdvertiseUserQueueService::addToQueue($toQueue);

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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Wap\User;
 
+use App\Modules\Cpa\Services\AdvertiseUserQueueService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Wap\BaseController;
 use App\Modules\Book\Services\BookConfigService;
@@ -104,6 +105,14 @@ class ReadRecordController extends BaseController
         });
         $res = json_encode($res);
         $res = json_decode($res);
+        foreach ($res as $key=>&$each){
+            $rec = AdvertiseUserQueueService::getUserAdvertiseSubscribe($each['uid'],$each['bid']);
+            if($rec) {
+                $each->is_advertise_sub=1;
+            }else {
+                $each->is_advertise_sub=0;
+            }
+        }
         return response()->collection(new ReadRecordTransformer(),$res);
     }
 

app/Http/Controllers/Wap/User/Transformers/ReadRecordTransformer.php

@@ -14,7 +14,8 @@ class ReadRecordTransformer
             'time' => $res->time,
             'cover' => $res->cover,
             'last_chapter' => $res->last_chapter,
-            'is_on_user_shelf'=>$res->is_on_user_shelf
+            'is_on_user_shelf'=>$res->is_on_user_shelf,
+            'is_advertise_sub'=>isset($res->is_advertise_sub)?$res->is_advertise_sub:0
         ];
     }
 }

app/Modules/Cpa/Models/AdvertiseUserQueque.php

@@ -10,6 +10,10 @@ class AdvertiseUserQueque extends Model
     protected $fillable = ['id', 'ad_user_id', 'uid', 'bid', 'advertise_id', 'add_time','status'];
 
     public static function addToQueue($params){
-        return self::create($params);
+        return self::updateOrCreate($params);
+    }
+
+    public static function getUserAdvertiseSubscribe($uid,$bid){
+        return self::where('uid',$uid)->where('bid',$bid)->where('status',1)->first();
     }
 }

app/Modules/Cpa/Services/AdvertiseUserQueueService.php

@@ -16,4 +16,8 @@ class AdvertiseUserQueueService
     public static function addToQueue($params){
         return AdvertiseUserQueque::addToQueue($params);
     }
+
+    public static function getUserAdvertiseSubscribe($uid,$bid) {
+        return AdvertiseUserQueque::getUserAdvertiseSubscribe($uid,$bid);
+    }
 }