Merge branch 'linqing' of git.shenbd.com:qm-develop/shenbd into linqing

application/models/Business/Order/OrderService.php

@@ -209,7 +209,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $sub_data = $common_model->findByOrderId($order['order_id'], 'reciver_name, reciver_info');
                     $address = '';
                     if($sub_data['reciver_info']) {
-                        $reciver_info = json_decode($sub_data['reciver_info'], true);
+                        $reciver_info = unserialize($sub_data['reciver_info']);
                         $address = $reciver_info['address'].$reciver_info['subaddress'];
                     }
                     $where = array('order_id'=>$order['order_id']);
@@ -246,6 +246,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 }
             }
         }
+        echo "do shipping\n";
 
         //付款7天内订单确认收货通知
         $where  = array('msg_status'=>3, 'payment_type'=>5, 'order_state'=>
@@ -310,6 +311,7 @@ class OrderServiceModel extends \Business\AbstractModel
                 }
             }
         }
+        echo "do reciver";
 
     }