合并分支 'wxg' 到 'master'

调试购买vip



查看合并请求 !27

@@ -8,6 +8,7 @@ use app\index\model\Viporder;
 use EasyWeChat\Foundation\Application;
 //use EasyWeChat\Payment\Order;
 use think\Db;
+use think\Log;
 
 /**
  * 微信支付,退款，提现
@@ -88,7 +89,6 @@ class WechatPay extends HomeBase
             $out_trade_no=$notify->out_trade_no;
             $vipOrderModel = new Viporder();
             $data = $vipOrderModel->findData(['num'=>$out_trade_no]);
-            cache('a',$data['vip_type']);
             if (empty($data)) { // 如果订单不存在
                 return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了
             }
@@ -99,7 +99,6 @@ class WechatPay extends HomeBase
             }
             $userModel = new \app\index\model\User();
             $user = $userModel->findData(['id'=>$data['user_id']]);
-            cache('b',$user['is_vip'].$user['vip_passttime']);
             // 用户是否支付成功
             if($successful){
                 if($data['vip_type'] == '1'){
@@ -109,9 +108,7 @@ class WechatPay extends HomeBase
                     }else{
                         $vip_passtime = time() + 365*24*60*60;
                     }
-                    cache('h',$vip_passtime);
                     $userModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
-                    cache('c',"QQQQ");
                 }else if($data['vip_type'] == '2'){
                     //超级会员
                     if($user['is_svip'] == '1'){
@@ -119,19 +116,17 @@ class WechatPay extends HomeBase
                     }else{
                         $svip_passtime = time() + 365*24*60*60;
                     }
-                    cache('g',$svip_passtime);
-                    cache('d',$userModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]));
+                    $userModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]);
                 }
                 $arr['status'] = "2";
                 $arr['paytime'] = time();
             }else{
                 $arr['status'] = "1";
             }
-            cache('f',"FFFF");
-            cache('e',$vipOrderModel->updateData(['id'=>$data['id']],$arr));
+            $vipOrderModel->updateData(['id'=>$data['id']],$arr);
             return true; // 返回处理完成
         });
-
+        Log::write('ccccccc');
         $response->send();
     }