合并分支 'wxg' 到 'master'

调试购买vip



查看合并请求 !16

@@ -107,7 +107,7 @@ class WechatPay extends HomeBase
                     }else{
                         $vip_passtime = time() + 365*24*60*60;
                     }
-                    $userModel->updateData(['vip_passtime'=>$vip_passtime,'province_ids'=>$data['province_ids']]);
+                    $userModel->updateData(['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
                 }else if($data['vip_type'] == '2'){
                     //超级会员
                     if($user['is_svip'] == '1'){

@@ -13,21 +13,23 @@ class User extends Model
 {
     public function findData($where){
         $data = $this->where($where)->find();
-        //判断是否为会员
-        $is_vip = '2';
-        if(!empty($data['vip_passtime'])){
-            if($data['vip_passtime'] > time()){
-                $is_vip = "1";
+        if(!empty($data)){
+            //判断是否为会员
+            $is_vip = '2';
+            if(!empty($data['vip_passtime'])){
+                if($data['vip_passtime'] > time()){
+                    $is_vip = "1";
+                }
             }
-        }
-        $is_svip = '2';
-        if(!empty($data['svip_passtime'])){
-            if($data['svip_passtime'] > time()){
-                $is_svip = "1";
+            $is_svip = '2';
+            if(!empty($data['svip_passtime'])){
+                if($data['svip_passtime'] > time()){
+                    $is_svip = "1";
+                }
             }
+            $data['is_vip'] = $is_vip;
+            $data['is_svip'] = $is_svip;
         }
-        $data['is_vip'] = $is_vip;
-        $data['is_svip'] = $is_svip;
         return $data;
     }
     public function updateData($where,$data){