active force subscribe

app/Http/Middleware/ReadOauth.php

@@ -328,13 +328,13 @@ class ReadOauth
             return false;
         }
         //ForceSubscribeService::
-        $res = ForceSubscribeService::forceSubscribeUsersByUid(['uid' => $uid]);
+        $res = ForceSubscribeService::forceSubscribeUsersByOpenidAndAppid($appid,$openid);
         if ($res) return false;
 
-        $forcesubuser = ForceSubscribeService::forceSubscribeUsersByOpenid(['openid' => $openid]);
+        /*$forcesubuser = ForceSubscribeService::forceSubscribeUsersByOpenid(['openid' => $openid]);
         if ($forcesubuser) {
             return false;
-        }
+        }*/
 
         $send_order_id = ReadRecordService::getSendOrderId($uid);
         if ($send_order_id) {

app/Modules/OfficialAccount/Models/ForceSubscribeUsers.php

@@ -129,7 +129,11 @@ class ForceSubscribeUsers extends Model
         return self::where(['openid' => $openid, 'is_subscribed' => 1])->first();
 
     }
-
+    //
+    static function forceSubscribeUsersByOpenidAndAppid($appid, $openid)
+    {
+        return  self::where(['openid' => $openid, 'appid' => $appid,'is_subscribed' => 1])->first();
+    }
     /**
      * openid获取强关用户
      */
@@ -662,20 +666,20 @@ class ForceSubscribeUsers extends Model
                     });
 
                     break;
-                 case 'd':
-                    # code...
-                    //6-13小时之间有过订阅记录
-                    
-                    $query->whereExists(function ($query) {
-                    		$query->select(DB::raw(1))
-                    		->from('orders')
-                    		->whereRaw('orders.uid =temp_force_subscribe_users.uid')
-                    		->whereRaw('orders.status="PAID"')
-                    		->where('orders.created_at','>',date('Y-m-d H:i:s', strtotime('-13 hour')))
-                    		->where('orders.created_at','<=',date('Y-m-d H:i:s', strtotime('-6 hour')))
-                    		->limit(1);
-                    });
-                    
+                 case 'd':
+                    # code...
+                    //6-13小时之间有过订阅记录
+                    
+                    $query->whereExists(function ($query) {
+                    		$query->select(DB::raw(1))
+                    		->from('orders')
+                    		->whereRaw('orders.uid =temp_force_subscribe_users.uid')
+                    		->whereRaw('orders.status="PAID"')
+                    		->where('orders.created_at','>',date('Y-m-d H:i:s', strtotime('-13 hour')))
+                    		->where('orders.created_at','<=',date('Y-m-d H:i:s', strtotime('-6 hour')))
+                    		->limit(1);
+                    });
+                    
                     break;
                 default:
                     # code...

app/Modules/OfficialAccount/Services/ForceSubscribeService.php

@@ -136,6 +136,15 @@ class ForceSubscribeService
     }
 
     /**
+     * 通过openid获取强关用户
+     */
+    static function forceSubscribeUsersByOpenidAndAppid($appid,$openid)
+    {
+
+        return ForceSubscribeUsers::forceSubscribeUsersByOpenidAndAppid($appid,$openid);
+    }
+
+    /**
      * 通过openid获取性别
      */
     static function getSexByOpenid($distribution_channel_id,$openid)
@@ -143,19 +152,19 @@ class ForceSubscribeService
     	return ForceSubscribeUsers::getSexByOpenid($distribution_channel_id,$openid);
     }
     
-    /**
-     * 通过openid获取性别，只根据强关书的性别
-     */
-    static function getSimpleSexByOpenid($distribution_channel_id,$openid)
-    {
-    	return ForceSubscribeUsers::getSimpleSexByOpenid($distribution_channel_id,$openid);
-    }
-    /**
-     * 通过uid获取性别，只根据强关书的性别
-     */
-    static function getSimpleSexByUid($uid)
-    {
-    	return ForceSubscribeUsers::getSimpleSexByUid($uid);
+    /**
+     * 通过openid获取性别，只根据强关书的性别
+     */
+    static function getSimpleSexByOpenid($distribution_channel_id,$openid)
+    {
+    	return ForceSubscribeUsers::getSimpleSexByOpenid($distribution_channel_id,$openid);
+    }
+    /**
+     * 通过uid获取性别，只根据强关书的性别
+     */
+    static function getSimpleSexByUid($uid)
+    {
+    	return ForceSubscribeUsers::getSimpleSexByUid($uid);
     }
     
 
@@ -575,12 +584,12 @@ class ForceSubscribeService
     }
     
     // 指定用户的基础信息获取
-    static function simpleForceUserCountByPrams($uids, $param,$skip){
-    
-    	$forceSubscribes = ForceSubscribeUsers::simpleForceUserCountByPrams($uids, $param,$skip);
-    
-    	return $forceSubscribes;
-    
+    static function simpleForceUserCountByPrams($uids, $param,$skip){
+    
+    	$forceSubscribes = ForceSubscribeUsers::simpleForceUserCountByPrams($uids, $param,$skip);
+    
+    	return $forceSubscribes;
+    
     }