Merge branch 'online_time' into test

173cf58c · jianghaiming · 17a7257d · 904186c1 · 173cf58c
Commit 173cf58c authored Aug 30, 2021 by jianghaiming
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

GoodsService.php application/services/goods/GoodsService.php +3 -3

No files found.
--- a/application/services/goods/GoodsService.php
+++ b/application/services/goods/GoodsService.php
@@ -1200,10 +1200,10 @@ class GoodsService
                $data["goods_info"]["is_tuanzhang"] = true;
                if (!empty($runningMarketing)) {
                    //分销返现多少钱
-                    if (!empty($marketing) && $marketing['commission_mode']) {
-                        $data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]] * $data["goods_info"]["price"]);
+                    if (!empty($marketing) && $marketing['commission_mode'] == 2) {
+                        $data["goods_info"]["cash_back"] = (float)sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]]);
                    }else{
-                        $data["goods_info"]["cash_back"] = sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]]);
+                        $data["goods_info"]["cash_back"] = (float)sprintf("%.2f",$runningMarketing[$params["goods_sku_id"]] * $data["goods_info"]["price"]);
                    }
                }
            }