debug

helper/bonus/account.php

@@ -142,6 +142,7 @@ class account implements IPriceCalculate
             }
             else {
                 return $result;
+
             }
         }
     }
@@ -158,7 +159,6 @@ class account implements IPriceCalculate
         else
             return 0;
     }
-
     public function member_id()
     {
         return $this->member_id;

helper/buy_first.php

@@ -73,16 +73,14 @@ class buy_first
         $bonusable_goods_amount = $calcer['bonusable_goods_amount'];
         $lowest_price_amount = $calcer['lowest_price_amount'];
 
-//        $result['available_pred'] = $this->mPriceCalculate->bonus_amount($bonusable_goods_amount,$lowest_price_amount);
-//        $result['available_bonus'] = $this->mPriceCalculate->bonus_amount($bonusable_goods_amount,$lowest_price_amount);
-
         $total_bonus = $this->mPriceCalculate->bonus_amount($bonusable_goods_amount,$lowest_price_amount);
         $ways = $this->mPriceCalculate->bonus_way($total_bonus);
+
         $result['available_bonus'] = $ways['available_bonus'];
         $result['available_pred']  = $ways['available_bonus'];
 
         $result['show_room']  = $ways['show_room'];
-        $result['room_bonus']  = $ways['room_bonus'];
+        $result['room_bonus'] = $ways['room_bonus'];
         $result['rooms']  = $ways['rooms'];
 
         $order_cash = $this->mPriceCalculate->order_cash($bonusable_goods_amount,$lowest_price_amount);
@@ -107,11 +105,11 @@ class buy_first
         $result['earn_bonus'] = $config['bonus_gap']['earn_bonus'];
 
         $result['usable_pred'] = true;
-        $result['pay_cash_pred']   = $result['goods_amount'] + $result['freight'] - $result['full_discount'] - $result['available_pred'] - $result['opgoods_discount'];
+        $result['pay_cash_pred']   = $result['goods_amount'] + $result['freight'] - $result['full_discount'] - $result['available_bonus'] - $result['opgoods_discount'] - $result['room_bonus'];
         $result['pay_cash_nopred'] = $result['goods_amount'] + $result['freight'] - $result['full_discount'] - $result['opgoods_discount'];
 
         //购物车显示应付现金
-        $result['pay_car_pred'] = $result['goods_amount'] - $result['full_discount'] - $result['available_pred'] - $result['opgoods_discount'];
+        $result['pay_car_pred'] = $result['goods_amount'] - $result['full_discount'] - $result['available_bonus'] - $result['opgoods_discount'] - $result['room_bonus'];
         //商品总价
         $result['pay_car_nopred'] = $result['goods_amount'] - $result['full_discount'] - $result['opgoods_discount'];
 
@@ -550,6 +548,8 @@ class buy_first
         $result['invoice'] = $this->invoice();
         $result['paytype'] = $this->paytype();
         $result['goods_list'] = $this->goods_list();
+        $result['rooms'] = $result['payinfo']['rooms'];
+        unset($result['payinfo']['rooms']);
 
         $summary = $this->summary();
         $result['summary']  = $summary['summary'];

helper/login_helper.php

@@ -26,9 +26,9 @@ class login_helper
         if($logger->ismember() == true)
         {
             if(wechat_helper::has_userinfo()) {
-                $user_info = wechat_helper::userinfo();
+                $user_info = wechat_helper::get_userinfo();
                 $logger->bind($user_info);
-                wechat_helper::clear_wxinfo();
+                wechat_helper::clear_userinfo();
             }
             return $logger->login();
         }
@@ -36,11 +36,11 @@ class login_helper
         {
             $user_info = [];
             if(wechat_helper::has_userinfo()) {
-                $user_info = wechat_helper::userinfo();
+                $user_info = wechat_helper::get_userinfo();
             }
             if($logger->register($user_info,$relay_id,$mobile) != false) {
                 account_helper::onRegister($logger->memberid(),$relay_id);
-                wechat_helper::clear_wxinfo();
+                wechat_helper::clear_userinfo();
                 return $logger->login();
             }
         }

helper/session_helper.php

@@ -274,7 +274,7 @@ class session_helper
             $relay_id = session_helper::relay_id();
             if (wechat_helper::has_userinfo())
             {
-                $user_info = wechat_helper::userinfo();
+                $user_info = wechat_helper::get_userinfo();
                 if(session_helper::logined())
                 {
                     $id_logginer = new login\memberid_log(session_helper::memberid());
@@ -310,7 +310,7 @@ class session_helper
                 }
 
                 account_helper::onLogin(session_helper::memberid());
-                wechat_helper::clear_wxinfo();
+                wechat_helper::clear_userinfo();
                 return false;
             }
             else
@@ -544,11 +544,9 @@ class session_helper
             return "";
         }
     }
-
     static public function set_regmobile($mobile) {
         $_SESSION['regmobile'] = $mobile;
     }
-
     static public function clear_regmobile()
     {
         if(array_key_exists('regmobile',$_SESSION)) {
@@ -560,9 +558,9 @@ class session_helper
 class wechat_helper
 {
     static public function has_userinfo() {
-        return !empty(self::userinfo());
+        return !empty(self::get_userinfo());
     }
-    static public function userinfo()
+    static public function get_userinfo()
     {
         if(array_key_exists('wx_author',$_SESSION)) {
             return $_SESSION['wx_author']['user_info'];
@@ -573,7 +571,7 @@ class wechat_helper
     static public function set_userinfo($userinfo) {
         $_SESSION['wx_author']['user_info'] = $userinfo;
     }
-    static public function clear_wxinfo()
+    static public function clear_userinfo()
     {
         if(array_key_exists('wx_author',$_SESSION)) {
             unset($_SESSION['wx_author']);

mobile/control/login.php

@@ -144,7 +144,7 @@ class loginControl extends mobileHomeControl
 
                     account_helper::onLogin(session_helper::memberid());
                     session_helper::clear_regmobile();
-                    wechat_helper::clear_wxinfo();
+                    wechat_helper::clear_userinfo();
                 }
                 else {
                     wechat_helper::set_userinfo($user_info);
@@ -161,14 +161,12 @@ class loginControl extends mobileHomeControl
                 if($mobile_loginner->ismember()) {
                     $mobile_loginner->bind($user_info);
                     $mobile_loginner->login();
-                }
-                else {
+                } else {
                     $unionid_loginner->register($user_info,session_helper::relay_id(),$mobile);
                     $unionid_loginner->login();
-
                     account_helper::onRegister(session_helper::memberid(),session_helper::relay_id());
                     session_helper::clear_regmobile();
-                    wechat_helper::clear_wxinfo();
+                    wechat_helper::clear_userinfo();
                 }
                 account_helper::onLogin(session_helper::memberid());
             }
@@ -180,15 +178,97 @@ class loginControl extends mobileHomeControl
         return self::outsuccess($this->ret_value());
     }
 
+    public function skipOp()
+    {
+        if(session_helper::has_regmobile()) {
+            $mobile = session_helper::get_regmobile();
+            session_helper::clear_regmobile();
+        }
+        if(wechat_helper::has_userinfo()) {
+            $user_info = wechat_helper::get_userinfo();
+            wechat_helper::clear_userinfo();
+        }
+
+        if(!empty($mobile))
+        {
+            $loginner = new login\mobile_log($mobile);
+            if($loginner->ismember()) {
+                $loginner->login();
+            }
+            else {
+                $loginner->register([],session_helper::relay_id(),$mobile);
+                $loginner->login();
+                account_helper::onRegister(session_helper::memberid(),session_helper::relay_id());
+            }
+        }
+
+        if(!empty($user_info))
+        {
+            $loginner = new login\open_userinfo_log($user_info);
+            if($loginner->ismember()) {
+                $loginner->login();
+            }
+            else {
+                $loginner->register([],session_helper::relay_id(),$mobile);
+                $loginner->login();
+                account_helper::onRegister(session_helper::memberid(),session_helper::relay_id());
+            }
+        }
+
+        return self::outsuccess($this->ret_value());
+    }
+
+    //给迷你小程序使用
+    public function wxauthenOp()
+    {
+        $user_info = $_GET['user_info'];
+        if(empty($user_info)) {
+            return self::outerr(errcode::ErrParamter, "上传的用户信息为空.");
+        }
+
+        $user_info = json_decode($user_info,true);
+        if(empty($user_info)) {
+            return self::outerr(errcode::ErrParamter, "上传的用户信息为空.");
+        }
+
+        $uid_login = new login\open_userinfo_log($user_info);
+        if(session_helper::logined())
+        {
+            if(session_helper::memberid() != $uid_login->memberid()) {
+                $uid_login->unbind_wechat();
+            }
+            $mid_login = new login\memberid_log(session_helper::memberid());
+            $mid_login->bind($user_info);
+            $mid_login->login();
+            account_helper::onLogin(session_helper::memberid());
+        }
+        else
+        {
+            if($uid_login->ismember()) {
+                $uid_login->bind($user_info);
+                $uid_login->login();
+                account_helper::onLogin(session_helper::memberid());
+            } else {
+                $uid_login->register($user_info,session_helper::relay_id(),session_helper::mobile());
+                $uid_login->login();
+                account_helper::onRegister(session_helper::memberid(),session_helper::relay_id());
+                session_helper::clear_regmobile();
+                wechat_helper::clear_userinfo();
+            }
+        }
+
+        return self::outsuccess($this->ret_value());
+    }
+
     public function ministartOp()
     {
         $code = $_GET['code'];
         if (empty($code)) return self::outerr(errcode::ErrParamter);
 
-        $appid          = \MiniPay\WxPayConfig::APPID;
-        $app_secret     = \MiniPay\WxPayConfig::APPSECRET;
+        $appid      = MiniPay\WxPayConfig::APPID;
+        $app_secret = MiniPay\WxPayConfig::APPSECRET;
 
-        $url    = "https://api.weixin.qq.com/sns/jscode2session?appid={$appid}&secret={$app_secret}&js_code={$code}&grant_type=authorization_code";
+        $url = "https://api.weixin.qq.com/sns/jscode2session?appid={$appid}&secret={$app_secret}&js_code={$code}&grant_type=authorization_code";
         $resp = http_request($url);
 
         if ($resp == false) {
@@ -199,8 +279,7 @@ class loginControl extends mobileHomeControl
             $body = json_decode($resp,true);
             if (isset($body['errcode'])) {
                 return self::outerr(errcode::ErrApptype,"获取appid失败");
-            }
-            else {
+            } else {
                 return self::outsuccess($body);
             }
         }
@@ -262,7 +341,7 @@ class loginControl extends mobileHomeControl
                 //pre->wx
                 if(wechat_helper::has_userinfo())
                 {
-                    $user_info = wechat_helper::userinfo();
+                    $user_info = wechat_helper::get_userinfo();
 
                     $union_logginer = new login\open_userinfo_log($user_info);
                     if($union_logginer->ismember()) {
@@ -271,11 +350,11 @@ class loginControl extends mobileHomeControl
                         $union_logginer->login();
                     }
                     else{
-                        $mobile_loginner->bind(wechat_helper::userinfo());
+                        $mobile_loginner->bind(wechat_helper::get_userinfo());
                         $mobile_loginner->login();
                     }
                     session_helper::clear_regmobile();
-                    wechat_helper::clear_wxinfo();
+                    wechat_helper::clear_userinfo();
                 }
                 else {
                     $mobile_loginner->login();
@@ -287,7 +366,7 @@ class loginControl extends mobileHomeControl
                 //pre->wx
                 if(wechat_helper::has_userinfo())
                 {
-                    $user_info = wechat_helper::userinfo();
+                    $user_info = wechat_helper::get_userinfo();
                     $union_logginer = new login\open_userinfo_log($user_info);
                     if($union_logginer->ismember()) {
                         $mobile_loginner->unbind_mobile();
@@ -295,13 +374,13 @@ class loginControl extends mobileHomeControl
                         $union_logginer->login();
                     }
                     else {
-                        $mobile_loginner->bind(wechat_helper::userinfo());
+                        $mobile_loginner->bind(wechat_helper::get_userinfo());
                         $mobile_loginner->login();
                     }
 
                     account_helper::onLogin(session_helper::memberid());
                     session_helper::clear_regmobile();
-                    wechat_helper::clear_wxinfo();
+                    wechat_helper::clear_userinfo();
                 }
                 else {
                     session_helper::set_regmobile($mobile);
@@ -313,7 +392,7 @@ class loginControl extends mobileHomeControl
             //pre->wx
             if(wechat_helper::has_userinfo())
             {
-                $user_info = wechat_helper::userinfo();
+                $user_info = wechat_helper::get_userinfo();
 
                 $union_logginer = new login\open_userinfo_log($user_info);
                 if($union_logginer->ismember()) {
@@ -328,7 +407,7 @@ class loginControl extends mobileHomeControl
 
                 account_helper::onLogin(session_helper::memberid());
                 session_helper::clear_regmobile();
-                wechat_helper::clear_wxinfo();
+                wechat_helper::clear_userinfo();
             }
             else {
                 session_helper::set_regmobile($mobile);
@@ -371,6 +450,7 @@ class loginControl extends mobileHomeControl
             return self::outerr(errcode::ErrDB,"对不起，系统出现错误:(");
         }
     }
+
     public function getcodexOp()
     {
         if(empty(session_helper::session_id())) {

mobile/control/member_talk.php

@@ -17,9 +17,6 @@ require_once(BASE_ROOT_PATH . '/helper/room/tpl_chatwo_home.php');
 require_once(BASE_ROOT_PATH . '/helper/FileUploader.php');
 
 use room\proto_type;
-use sms_helper;
-use Sms;
-
 class member_talkControl extends mbMemberControl
 {
     const max_msgid = 1 << 32;