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

app/api/controller/order/StoreOrderController.php

@@ -50,7 +50,7 @@ class StoreOrderController
         list($cartId) = UtilService::postMore(['cartId'], $request, true);
         if (!is_string($cartId) || !$cartId) return app('json')->fail('请提交购买的商品');
         $uid = $request->uid();
-        $user = User::getUserinfo($uid);
+        $user = User::get($uid);
         $cartGroup = StoreCart::getUserProductCartList($uid, $cartId, 1, $request->store_id(),true);
         if (!$cartGroup) return app('json')->fail(StoreCart::getErrorInfo());
         if ($cartGroup['only_store_user'] && !$user['admin_id']) return app('json')->fail('非门店用户不可采购');