Merge branch 'master' of http://git.liuniu946.com/Kirin/zccy

app/models/store/StoreExchange.php

@@ -209,7 +209,7 @@ class StoreExchange extends BaseModel
         $carts = StoreOrderCartInfo::where('oid', $order['id'])->where('cart_id', 'in', $order['cart_id'])
             ->select();
         foreach ($carts as $cart) {
-            $info = json_decode($cart['cart_info'], true);
+            $info = $cart['cart_info'];
             var_dump($info);
         }
     }