Merge branch 'master' of http://114.215.101.231:8099/guosheng/store into Branch_liuzhen

@@ -11,6 +11,7 @@ namespace app\api\controller;
 use app\common\controller\Api;
 use app\common\controller\Api;
 use app\common\controller\Frontend;
 use app\common\controller\Frontend;
 use app\index\model\OrderDetail;
 use app\index\model\OrderDetail;
+use app\index\model\Store;
 use app\index\model\Viporder;
 use app\index\model\Viporder;
 use think\Db;
 use think\Db;
 
 
@@ -43,24 +44,32 @@ class Notify extends Frontend
         }
         }
         $userModel = new \app\index\model\User();
         $userModel = new \app\index\model\User();
         $user = $userModel->findData(['id'=>$data['user_id']]);
         $user = $userModel->findData(['id'=>$data['user_id']]);
+        $storeModel = new Store();
+        $store = $storeModel->findData(['user_id'=>$data['user_id']]);
         // 用户是否支付成功
         // 用户是否支付成功
         if(!empty($result)){
         if(!empty($result)){
             if($data['vip_type'] == '1'){
             if($data['vip_type'] == '1'){
                 //普通会员
                 //普通会员
                 if($user['is_vip'] == '1'){
                 if($user['is_vip'] == '1'){
-                    $vip_passtime = $user['vip_passttime'] + 365*24*60*60;
+                    $vip_passtime = $user['vip_passtime'] + 365*24*60*60;
                 }else{
                 }else{
                     $vip_passtime = time() + 365*24*60*60;
                     $vip_passtime = time() + 365*24*60*60;
                 }
                 }
-                $userModel->updateData(['vip_passtime'=>$vip_passtime]);
+                $userModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
+                if(!empty($store)){
+                    $storeModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
+                }
             }else if($data['vip_type'] == '2'){
             }else if($data['vip_type'] == '2'){
                 //超级会员
                 //超级会员
                 if($user['is_svip'] == '1'){
                 if($user['is_svip'] == '1'){
-                    $svip_passtime = $user['svip_passttime'] + 365*24*60*60;
+                    $svip_passtime = $user['svip_passtime'] + 365*24*60*60;
                 }else{
                 }else{
                     $svip_passtime = time() + 365*24*60*60;
                     $svip_passtime = time() + 365*24*60*60;
                 }
                 }
-                $userModel->updateData(['svip_passtime'=>$svip_passtime]);
+                $userModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]);
+                if(!empty($store)){
+                    $storeModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]);
+                }
             }
             }
             $arr['status'] = "2";
             $arr['status'] = "2";
             $arr['paytime'] = time();
             $arr['paytime'] = time();

@@ -4,10 +4,12 @@ namespace app\index\controller;
 
 
 use app\common\controller\HomeBase;
 use app\common\controller\HomeBase;
 use app\index\model\OrderDetail;
 use app\index\model\OrderDetail;
+use app\index\model\Store;
 use app\index\model\Viporder;
 use app\index\model\Viporder;
 use EasyWeChat\Foundation\Application;
 use EasyWeChat\Foundation\Application;
 //use EasyWeChat\Payment\Order;
 //use EasyWeChat\Payment\Order;
 use think\Db;
 use think\Db;
+use think\Log;
 
 
 /**
 /**
  * 微信支付,退款，提现
  * 微信支付,退款，提现
@@ -88,7 +90,6 @@ class WechatPay extends HomeBase
             $out_trade_no=$notify->out_trade_no;
             $out_trade_no=$notify->out_trade_no;
             $vipOrderModel = new Viporder();
             $vipOrderModel = new Viporder();
             $data = $vipOrderModel->findData(['num'=>$out_trade_no]);
             $data = $vipOrderModel->findData(['num'=>$out_trade_no]);
-            cache('a',$data['vip_type']."&");
             if (empty($data)) { // 如果订单不存在
             if (empty($data)) { // 如果订单不存在
                 return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了
                 return 'Order not exist.'; // 告诉微信，我已经处理完了，订单没找到，别再通知我了
             }
             }
@@ -99,39 +100,41 @@ class WechatPay extends HomeBase
             }
             }
             $userModel = new \app\index\model\User();
             $userModel = new \app\index\model\User();
             $user = $userModel->findData(['id'=>$data['user_id']]);
             $user = $userModel->findData(['id'=>$data['user_id']]);
-            cache('b',$user['is_vip']."&".$user['id']."&".$user['vip_passttime']);
+            $storeModel = new Store();
+            $store = $storeModel->findData(['user_id'=>$data['user_id']]);
             // 用户是否支付成功
             // 用户是否支付成功
             if($successful){
             if($successful){
                 if($data['vip_type'] == '1'){
                 if($data['vip_type'] == '1'){
                     //普通会员
                     //普通会员
                     if($user['is_vip'] == '1'){
                     if($user['is_vip'] == '1'){
-                        $vip_passtime = $user['vip_passttime'] + 365*24*60*60;
+                        $vip_passtime = $user['vip_passtime'] + 365*24*60*60;
                     }else{
                     }else{
                         $vip_passtime = time() + 365*24*60*60;
                         $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'].","]);
                     $userModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
-                    cache('c',"QQQQ");
+                    if(!empty($store)){
+                        $storeModel->updateData(['id'=>$user['id']],['vip_passtime'=>$vip_passtime,'province_ids'=>",".$data['province_ids'].","]);
+                    }
                 }else if($data['vip_type'] == '2'){
                 }else if($data['vip_type'] == '2'){
                     //超级会员
                     //超级会员
                     if($user['is_svip'] == '1'){
                     if($user['is_svip'] == '1'){
-                        $svip_passtime = $user['svip_passttime'] + 365*24*60*60;
+                        $svip_passtime = $user['svip_passtime'] + 365*24*60*60;
                     }else{
                     }else{
                         $svip_passtime = time() + 365*24*60*60;
                         $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]);
+                    if(!empty($store)){
+                        $storeModel->updateData(['id'=>$user['id']],['svip_passtime'=>$svip_passtime]);
+                    }
                 }
                 }
                 $arr['status'] = "2";
                 $arr['status'] = "2";
                 $arr['paytime'] = time();
                 $arr['paytime'] = time();
             }else{
             }else{
                 $arr['status'] = "1";
                 $arr['status'] = "1";
             }
             }
-            cache('f',"FFFF");
-            cache('e',$vipOrderModel->updateData(['id'=>$data['id']],$arr));
+            $vipOrderModel->updateData(['id'=>$data['id']],$arr);
             return true; // 返回处理完成
             return true; // 返回处理完成
         });
         });
-
         $response->send();
         $response->send();
     }
     }
 
 

@@ -81,4 +81,8 @@ class Store extends Model
         }
         }
         return $data;
         return $data;
     }
     }
+    public function updateData($where,$data){
+        $result = $this->where($where)->update($data);
+        return $result;
+    }
 }
 }

@@ -510,7 +510,7 @@
                                 支付宝
                                 支付宝
                             </div>
                             </div>
                         </li>
                         </li>
-                        <li onclick="changePayMode(this,'yunPay')" data-pay_type="3">
+                        <!--<li onclick="changePayMode(this,'yunPay')" data-pay_type="3">
                             <div class="imgBox">
                             <div class="imgBox">
                                 <img class="checkImg" src="__CDN__/assets/store/images/radioUnSelect.png" alt="img">
                                 <img class="checkImg" src="__CDN__/assets/store/images/radioUnSelect.png" alt="img">
                             </div>
                             </div>
@@ -518,7 +518,7 @@
                                 <img src="__CDN__/assets/store/images/yunshanfu.png" alt="img">
                                 <img src="__CDN__/assets/store/images/yunshanfu.png" alt="img">
                                 云闪付
                                 云闪付
                             </div>
                             </div>
-                        </li>
+                        </li>-->
                     </ul>
                     </ul>
                 </div>
                 </div>
                 <!--提交订单-->
                 <!--提交订单-->