Merge branch 'master' into jielong

application/services/goods/GoodsService.php

@@ -882,7 +882,7 @@ class GoodsService
                         $data["goods_info"]["is_tuanzhang"] = true;
                         if (!empty($runningMarketing)) {
                             //分销返现多少钱
-                            $data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$sku["goods_sku_id"]] * $data["goods_info"]["price"]);
+                            $data["goods_info"]["cash_back"] = substr(sprintf("%.4f",$runningMarketing[$sku["goods_sku_id"]] * $data["goods_info"]["price"]),0,-2);
                         }
                     }
                 }