Merge branch 'goods' of 121.43.114.153:/home/git/repositories/shopnc into goods

Conflicts:
	mobile/dispatch_notify.php

mobile/control/member_cart.php

@@ -141,7 +141,7 @@ class member_cartControl extends mobileMemberControl
                     if(intval($value['goods_num']) !== $quantity)
                     {
                         if(!$this->_check_goods_storage($value, $quantity, $this->member_info['member_id'])) {
-                            array_push($quantity_error, array('cart_id' => $value['cart_id'], 'quantity' => $quantity));
+                            array_push($quantity_error, array('cart_id' => $value['cart_id'], 'quantity' => $quantity,'err_info'=>'库存不足'));
                         }
                         else
                         {

mobile/dispatch_notify.php

@@ -9,16 +9,37 @@
 try
 {
     //tid-订单号，status-1，consign_time-发货时间，logistics_no-快递流水，logistics_company-快递公司
-    $tid = $_POST['tid'];
-    $status = $_POST['status'];
-    $consign_time = $_POST['consign_time'];
-    $logistics_no = $_POST['logistics_no'];
-    $logistics_company = $_POST['logistics_company'];
+    $order_sn = trim($_POST['tid']);
+    $status = intval($_POST['status']);
+    //$consign_time = $_POST['consign_time'];
+    $logistics_no = trim($_POST['logistics_no']);
+    //$logistics_company = $_POST['logistics_company'];
+
+    Log::record("dispatch notify value: order_sn = {$order_sn},status={$status},consign_time = {$consign_time} logistics_no = {$logistics_no} logistics_company = {$logistics_company}.",Log::DEBUG);
+
+    $remote_addr = $_SERVER['REMOTE_ADDR'];
+
+    if(!empty($order_sn) && !empty($logistics_no))
+    {
+        if($status == 1)
+        {
+            $ret = Model()->table('order')->where(array('order_sn' => $order_sn))->update(array('order_state' => ORDER_STATE_SEND,'shipping_code' => $logistics_no));
+            if($ret) {
+                echo 'SUCCESS';
+            } else {
+                echo 'AGAIN';
+            }
+        }
+        else{
+            echo 'SUCCESS';
+        }
+    }
+    else
+    {
+        echo 'FAIL';
+    }
 
-    Log::record("dispatch notify value: tid = {$tid},status={$status},consign_time = {$consign_time} logistics_no = {$logistics_no} logistics_company = {$logistics_company}.",Log::DEBUG);
-    echo 'SUCCESS';
 } catch (WxPayException $e){
-    Log::record($e->getTraceAsString(),Log::ERR);
-    $msg = $e->errorMessage();
-    echo 'FAIL';
+    Log::record($e->errorMessage(),Log::ERR);
+    echo 'AGAIN';
 }