add to local

data/logic/buy.logic.php

@@ -75,7 +75,6 @@ class buyLogic {
 
         //取得POST ID和购买数量
         $buy_items = $this->_parseItems($cart_id);
-        Log::record('Buy item '. json_encode($buy_items),Log::DEBUG);
         if (empty($buy_items)) {
             return callback(false, '所购商品无效');
         }
@@ -164,9 +163,6 @@ class buyLogic {
 
         //重新计算优惠后(满即送)的店铺实际商品总金额
         $store_goods_total = $this->_logic_buy_1->reCalcGoodsTotal($store_goods_total,$store_mansong_rule_list,'mansong');
-
-        Log::record("Store goods total ".$store_goods_total, Log::DEBUG);
-
         //返回店铺可用的代金券
         $store_voucher_list = $this->_logic_buy_1->getStoreAvailableVoucherList($store_goods_total, $member_id);
         $result['store_voucher_list'] = $store_voucher_list;
@@ -243,8 +239,8 @@ class buyLogic {
     public function buyStep2($post, $member_id, $member_name, $member_email) {
         
         $this->_member_info['member_id'] = $member_id;
-        $this->_member_info['member_name'] = empty($member_name) ? '' : $member_name;
-        $this->_member_info['member_email'] = empty($member_email) ? '' : $member_email;
+        $this->_member_info['member_name'] = $member_name;
+        $this->_member_info['member_email'] = $member_email;
         $this->_post_data = $post;
 
         try {

data/model/address.model.php

@@ -30,7 +30,8 @@ class addressModel extends Model {
      */
     public function getAddressInfo($condition, $order = '') {
         $addr_info = $this->where($condition)->order($order)->find();
-        if (C('delivery_isuse') && $addr_info['dlyp_id']) {
+        if (C('delivery_isuse') && $addr_info['dlyp_id'])
+        {
             $model_delivery = Model('delivery_point');
             $dlyp_info = $model_delivery->getDeliveryPointOpenInfo(array('dlyp_id' => $addr_info['dlyp_id']));
             if (!empty($dlyp_info)) {
@@ -42,8 +43,7 @@ class addressModel extends Model {
                 $addr_info['dlyp_mobile'] = $dlyp_info['dlyp_mobile'];
                 $addr_info['area_id'] = $dlyp_info['dlyp_area_3'];
                 $addr_info['area_info'] = $dlyp_info['dlyp_area_info'];
-                $addr_info['address'] = '（'.$dlyp_info['dlyp_address_name'].') '.$dlyp_info['dlyp_address']
-                . '，电话：'.trim($dlyp_info['dlyp_mobile'].'，'.$dlyp_info['dlyp_telephony'],'，');
+                $addr_info['address'] = '（'.$dlyp_info['dlyp_address_name'].') '.$dlyp_info['dlyp_address'] . '，电话：'.trim($dlyp_info['dlyp_mobile'].'，'.$dlyp_info['dlyp_telephony'],'，');
             }
         }
         return $addr_info;

data/model/member.model.php

@@ -93,11 +93,17 @@ class memberModel extends Model
 
         $_SESSION['is_login'] = '1';
         $_SESSION['member_id'] = $member_info['member_id'];
+        $_SESSION['member_mobile'] = $member_info['member_mobile'];
+        $_SESSION['wx_openid'] = $member_info['member_wxopenid'];
         $_SESSION['member_name'] = $member_info['member_name'];
         $_SESSION['member_email'] = $member_info['member_email'];
         $_SESSION['is_buy'] = isset($member_info['is_buy']) ? $member_info['is_buy'] : 1;
         $_SESSION['avatar'] = $member_info['member_avatar'];
-        $_SESSION['member_mobile'] = $member_info['member_mobile'];
+        $_SESSION['member_truename'] = $member_info['member_truename'];
+        $_SESSION['member_sex'] = $member_info['member_sex'];
+        $_SESSION['member_birthday'] = $member_info['member_birthday'];
+        $_SESSION['member_mobile_bind'] = $member_info['member_mobile_bind'];
+        $_SESSION['member_state'] = $member_info['member_state'];
 
         $seller_info = Model('seller')->getSellerInfo(array('member_id' => $_SESSION['member_id']));
         $_SESSION['store_id'] = $seller_info['store_id'];
@@ -105,9 +111,6 @@ class memberModel extends Model
         if (trim($member_info['member_qqopenid'])) {
             $_SESSION['openid'] = $member_info['member_qqopenid'];
         }
-        if (trim($member_info['member_wxopenid'])) {
-            $_SESSION['wx_openid'] = $member_info['member_wxopenid'];
-        }
         if (trim($member_info['member_sinaopenid'])) {
             $_SESSION['slast_key']['uid'] = $member_info['member_sinaopenid'];
         }

helper/field_helper.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: stanley-king
+ * Date: 16/3/28
+ * Time: 下午5:22
+ */
+
+class field_helper
+{
+    public static function validate_null_string(&$datas,$fields,$def_val='')
+    {
+        $keys = explode(',',$fields);
+        foreach($datas as $key => $val)
+        {
+            if(in_array($key,$keys))
+            {
+                if(!isset($val)) {
+                    $datas[$key] = $def_val;
+                }
+            }
+        }
+    }
+
+    public static function validate_null_int(&$datas,$fields,$def_val=0)
+    {
+        $keys = explode(',',$fields);
+        foreach($datas as $key => $val)
+        {
+            if(in_array($key,$keys))
+            {
+                if(!isset($val)) {
+                    $datas[$key] = $def_val;
+                }
+            }
+        }
+    }
+}

mobile/control/login.php

@@ -11,6 +11,7 @@ require_once(BASE_DATA_PATH . '/model/member.model.php');
 require_once(BASE_CORE_PATH . '/framework/libraries/sms.php');
 require_once(BASE_CORE_PATH . '/framework/function/core.php');
 require_once(BASE_ROOT_PATH . '/helper/sms_helper.php');
+require_once(BASE_ROOT_PATH . '/helper/field_helper.php');
 
 //登录，获取验证码，注册
 
@@ -21,6 +22,7 @@ class loginControl extends mobileHomeControl
 
     //客户登录身份类型
     protected $client_login_type_array = array(0, 1, 2);
+    private static $fields = 'member_id,member_mobile,member_wxopenid,member_name,member_truename,member_avatar,member_sex,member_birthday,member_passwd,member_paypwd,member_email,member_mobile_bind,member_state';
 
     public function __construct()
     {
@@ -123,7 +125,10 @@ class loginControl extends mobileHomeControl
             return NULL;
         }
 
-        $member_info = $model_member->getMemberInfo($conditions);
+        $member_info = $model_member->getMemberInfo($conditions,self::$fields);
+        field_helper::validate_null_string($member_info,'member_mobile,member_wxopenid,member_name,member_truename,member_avatar,member_email');
+        field_helper::validate_null_int($member_info,'member_sex',0);
+
         return $member_info;
     }
 
@@ -191,7 +196,7 @@ class loginControl extends mobileHomeControl
         }
         else
         {
-            $member_info = array('member_mobile' => $mobile, 'member_type' => 0, 'member_passwd' => $password,'member_name' => $mobile);
+            $member_info = array('member_mobile' => $mobile, 'member_type' => 0, 'member_passwd' => $password,'member_sex' => 0, 'member_name' => $mobile,'member_mobile_bind' => 1);
             $success = $model->addMember($member_info);
             if ($success == false) {
                 return self::outerr(errcode::ErrRegister);

run.php

@@ -3,6 +3,34 @@
 
 define('InShopNC',true);
 
+
+$str = NULL;
+$y = '';
+if(isset($str)) {
+    $x = 0;
+}
+
+if(empty($str)) {
+    $x = 1;
+}
+
+if($str == NULL) {
+    $x = 2;
+}
+
+if(isset($y)) {
+    $x = 0;
+}
+
+if(empty($y)) {
+    $x = 1;
+}
+
+if($y == NULL) {
+    $x = 2;
+}
+
+
 $file = "/mobile/index.php";
 $ops = explode("?",$file);