冲突问题

@@ -189,8 +189,8 @@ class Helpers
      * @return float|string 转换之后的价格
      * @return float|string 转换之后的价格
      */
      */
     public static function transPrice($price)
     public static function transPrice($price)
-    {
-        return number_format($price, 2, '.', '');
+    {
+        return !empty($price) ? number_format($price, 2, '.', '') : 0;
     }
     }
 
 
     /**
     /**
@@ -806,13 +806,13 @@ class Helpers
      * @return string
      * @return string
      */
      */
     public static function getClientIp()
     public static function getClientIp()
-    {
-        $ip = '0.0.0.0';
-        if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != '')
-            $ip = $_SERVER['HTTP_CLIENT_IP'];
-        elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != '')
-            $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-        elseif (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != '')
+    {
+        $ip = '0.0.0.0';
+        if (isset($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != '')
+            $ip = $_SERVER['HTTP_CLIENT_IP'];
+        elseif (isset($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != '')
+            $ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
+        elseif (isset($_SERVER['REMOTE_ADDR']) && $_SERVER['REMOTE_ADDR'] != '')
             $ip = $_SERVER['REMOTE_ADDR'];
             $ip = $_SERVER['REMOTE_ADDR'];
         return $ip;
         return $ip;
     }
     }