uupp

application/api/controller/Index.php

@@ -558,8 +558,8 @@ class Index extends Api
 
         $this->success('筛选年龄段', $list);
     }
-
-    public function nearUserNew()
+    
+    public function nearuser()
     {
         //        if(empty($this->auth->longitude) || empty($this->auth->latitude)){
 //            // $this->success('success',[]);
@@ -588,11 +588,11 @@ class Index extends Api
         $order = 'user.is_active desc, user.active_time desc';
         if (in_array($type,[0,1])) {
             if ($this->auth->gender == 1) {
-                $order = 'user.is_active desc, user.active_time desc, uw.get_money desc';
-//                $order = 'user.is_active desc, user.active_time desc';
+                // $order = 'user.is_active desc, user.active_time desc, uw.get_money desc';
+                $order = 'user.is_active desc, user.active_time desc';
             } else {
-                $order = 'user.is_active desc, user.active_time desc, uw.pay_money desc';
-//                $order = 'user.is_active desc, user.active_time desc';
+                // $order = 'user.is_active desc, user.active_time desc, uw.pay_money desc';
+                $order = 'user.is_active desc, user.active_time desc';
             }
         }
         if ($type == 0) {
@@ -649,7 +649,7 @@ class Index extends Api
 
         //$list = Db::name('user')->alias('user')->field($field)->where($map)->order($order)->autopage()->select();
         $list = Db::name('user')->alias('user')->field($field)
-             ->join('user_wallet uw','uw.user_id = user.id','LEFT')
+             //->join('user_wallet uw','uw.user_id = user.id','LEFT')
             ->where($map)->order($order)->autopage()->select();
         //dump($list);exit;
 
@@ -738,7 +738,7 @@ class Index extends Api
     }
 
     //推荐/附近/新人
-    public function nearuser(){
+    public function nearuserbak(){
 //        if(empty($this->auth->longitude) || empty($this->auth->latitude)){
 //            // $this->success('success',[]);
 //            $this->error('请先开启定位');

application/api/controller/Pay.php

@@ -184,7 +184,7 @@ class Pay extends Api
                     'amount'       => $data['money'],
                     //'amount'       => 0.01,
                     'method'       => 'app',
-                    'notifyurl' => 'http://www.siweiele.com/notify.php/paytype/'.$pay_type,
+                    'notifyurl' => 'http://www.zhiyinvip001.com/notify.php/paytype/'.$pay_type,
                     'returnurl' => '',
                 ];
                 $res = Service::submitOrder($params);
@@ -409,7 +409,7 @@ class Pay extends Api
                     'amount'       => $data['money'],
                     //'amount'       => 0.01,
                     'method'       => 'app',
-                    'notifyurl' => 'http://www.siweiele.com/notify.php/paytype/'.$pay_type,
+                    'notifyurl' => 'http://www.zhiyinvip001.com/notify.php/paytype/'.$pay_type,
                     'returnurl' => '',
                 ];
                 $res = Service::submitOrder($params);

application/api/controller/Supay.php

@@ -98,7 +98,7 @@ class Supay extends Api
                     'amount'       => $data['money'],
                     //'amount'       => 0.01,
                     'method'       => 'app',
-                    'notifyurl' => 'http://siweiele.com/notify.php/paytype/'.$pay_type,
+                    'notifyurl' => 'http://zhiyinvip001.com/notify.php/paytype/'.$pay_type,
                     'returnurl' => '',
                 ];
                 $res = Service::submitOrder($params);

application/api/controller/Tenim.php

@@ -747,6 +747,9 @@ exit;
      */
     public function callback() {
         $input = file_get_contents("php://input"); // 主题信息
+        if(!$input)  {
+            echo '无数据';exit;
+        }
         $input = json_decode($input,true);
         $CallbackCommand = $input["CallbackCommand"];
         switch ($CallbackCommand) {

application/api/controller/Usercenter.php

@@ -2125,7 +2125,7 @@ $resArray['money'] = $money;  //返回给前端的计算结果
             $map['open_match_video'] = 1;
         }
 
-        $lists = Db::name('user')->field('id,nickname,username,avatar')->where($map)->order('is_active desc, active_time desc')/*->page($this->page,100)*/->select();
+        $lists = Db::name('user')->field('id,nickname,username,avatar')->where($map)->order('is_active desc, active_time desc')->page($this->page,100)->select();
         //$lists = $this->fliter_user($lists,100);
 
         $lists = list_domain_image($lists,['avatar,audio_bio']);

application/api/library/ExceptionHandle.php

@@ -32,9 +32,9 @@ class ExceptionHandle extends Handle
         $result = ['code' => $code, 'msg' => $msg, 'time' => time(), 'data' => null];
 
         //记录app异常返回结果
-//        if(defined('API_REQUEST_ID')) { //记录app正常返回结果
-//            db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result)]);
-//        }
+        // if(defined('API_REQUEST_ID')) { //记录app正常返回结果
+        //     db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result)]);
+        // }
 
         return json($result, $statuscode);
     }