浏览代码

before add log

stanley-king 9 年之前
父节点
当前提交
584d492a2f

+ 17 - 5
core/framework/db/mysqli.php

@@ -8,19 +8,23 @@
 
 
 defined('InShopNC') or exit('Access Invalid!');
-class Db{
-
+class Db
+{
 	private static $link = array();
 	private static $iftransacte = true;
 
+	private static $connect_time = 0;
+
 	private function __construct(){
 		if (!extension_loaded('mysqli')){
 			throw_exception("Db Error: mysqli is not install");
 		}
 	}
 
-	private static function connect($host = 'slave')
-	{
+	private static function connect($host = 'slave'){
+		if((time() - self::$connect_time > 1800) && defined('MOBILE_SERVER') && self::$connect_time > 0){
+			self::closeLink();
+		}
 		if (C('db.master') == C('db.slave'))
 		{
 			if (is_object(self::$link['slave'])){
@@ -39,7 +43,7 @@ class Db{
 		}
 
 		self::$link[$host] = @new mysqli($conf['dbhost'], $conf['dbuser'], $conf['dbpwd'], $conf['dbname'], $conf['dbport']);
-
+		self::$connect_time = time();
 		if (mysqli_connect_errno()) throw_exception("Db Error: database connect failed");
 
 		switch (strtoupper($conf['dbcharset']))
@@ -78,6 +82,14 @@ class Db{
 		}
 	}
 
+	private static function closeLink(){
+		foreach(self::$link as $db){
+			if(is_object($db)){
+				mysqli_close($db);
+			}
+		}
+	}
+
     public static function ping($host = 'master') {
         if (is_object(self::$link[$host])) {
 //         if (is_object(self::$link[$host]) && !self::$link[$host]->ping()) {

+ 7 - 0
data/logic/delivery.logic.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2015/12/22
+ * Time: 13:56
+ */

+ 6 - 1
mobile/control/member_address.php

@@ -38,7 +38,8 @@ class member_addressControl extends mobileMemberControl {
         $condition['address_id'] = $address_id;
         $address_info = $model_address->getAddressInfo($condition);
         if(!empty($address_id) && $address_info['member_id'] == $this->member_info['member_id']) {
-            joutput_data(array('address_info' => $address_info));
+//            joutput_data(array('address_info' => $address_info));
+            joutput_data($address_info);
         } else {
             joutput_error(errcode::ErrAddress, '地址不存在');
         }
@@ -56,6 +57,10 @@ class member_addressControl extends mobileMemberControl {
         $condition['address_id'] = $address_id;
         $condition['member_id'] = $this->member_info['member_id'];
         $model_address->delAddress($condition);
+        $default_address_info = $model_address->getDefaultAddressInfo(array('member_id'=>$this->member_info['member_id']));
+        if(intval($default_address_info['is_default']) === 0){
+            $this->_set_default($default_address_info['address_id'], 1);
+        }
         joutput_data(array('result'=>'1'));
     }
 

+ 2 - 3
mobile/control/member_cart.php

@@ -110,7 +110,7 @@ class member_cartControl extends mobileMemberControl
     }
 
     public function cart_editOp(){
-        $cart_list = explode(','. urldecode($_POST['cart_list']));
+        $cart_list = explode(',', urldecode($_POST['cart_list']));
         $new_cart_list= array();
         if (is_array($cart_list)) {
             foreach ($cart_list as $value) {
@@ -236,8 +236,7 @@ class member_cartControl extends mobileMemberControl
 
 		    //限时折扣
 		    $logic_buy_1->getXianshiInfo($goods_info,$quantity);
- 
-		    $quantity = $goods_info['goods_num'];
+
 		    if(intval($goods_info['goods_storage']) < $quantity) {
                 return false;
 		    }

+ 1 - 1
mobile/control/member_invoice.php

@@ -60,7 +60,7 @@ class member_invoiceControl extends mobileMemberControl {
         $data = array();
         $data['inv_state'] = 1;
         $data['inv_title'] = $_POST['inv_title_select'] == 'person' ? '个人' : $_POST['inv_title'];
-        $data['inv_content'] = $_POST['inv_content'];
+        $data['inv_content'] = urldecode($_POST['inv_content']);
         $data['member_id'] = $this->member_info['member_id'];
         $result = $model_invoice->addInv($data);
         if($result) {

+ 1 - 1
mobile/index.php

@@ -6,7 +6,7 @@
  */
 
 define('APP_ID','mobile');
-define('IGNORE_EXCEPTION', true);
+//define('IGNORE_EXCEPTION', true);
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 ////框架扩展