Merge branch 'version1.5' into dev_wf

app/admin/controller/Consult.php

@@ -1756,8 +1756,9 @@ class Consult extends Base
                     "mark_fee"=>$value["mark_fee"],
                     "nake_fee"=>$value["nake_fee"],
                     "cert_fee"=>$value["cert_fee"],
-                    "cost_fee"=>$value["cost_fee"],
-//                    "cost_fee"=>$value['status']>=5? $value["sale_cost_fee"]: $value["cost_fee"],暂时注掉，搞不清楚原因@吴广广
+              //      "cost_fee"=>$value["cost_fee"],
+                   "cost_fee"=>$value["sale_cost_fee"]!=$value['origin_cost_fee']? $value["sale_cost_fee"]: $value["cost_fee"],
+                    //暂时注掉，搞不清楚原因@吴广广
                     "num"=>$bidinfo["num"],
                 ];
 
@@ -2158,7 +2159,7 @@ class Consult extends Base
                 "mark_fee" => $value["mark_fee"],
                 "nake_fee" => $value["nake_fee"],
                 "cert_fee" => $value["cert_fee"],
-                "cost_fee" => $value['status'] >= 5 ? $value["sale_cost_fee"] : $value["cost_fee"],
+                "cost_fee" => $value["sale_cost_fee"]!=$value["origin_cost_fee"] ? $value["sale_cost_fee"] : $value["cost_fee"],
                 "num" => $bidinfo["num"],
             ];
             if ($value['is_gold_price'] == 1) {

app/admin/controller/Goodup.php

@@ -1382,8 +1382,8 @@ class Goodup extends Base
             if($good_code===""){
                 return error_show(1004,"参数plat_code不能为空");
             }
-            $is_exit = Db::name("good_platform")->where(["plat_code"=>$good_code,"is_del"=>0])->where("id","<>",$platform['id'])
-                ->find();
+            $is_exit = Db::name("good_platform")->where(["plat_code"=>$good_code,"platform_code"=>$platform['platform_code'],
+                "is_del"=>0])->where("id","<>", $platform['id'])->find();
             if($is_exit==false){
                 $platform['plat_code']=$good_code;
             }else{

app/admin/controller/Stat.php

@@ -20,7 +20,7 @@ class Stat extends \app\BaseController
         $endtime = isset($post['date']) ? $post['date'] : date("Y-m-d");
 
         $sql = "
-        SELECT
+    SELECT
 	`month` as m,
 	ifnull(month_total_fee,0) as total,
 	ifnull(`week`,'') as w,
@@ -33,7 +33,7 @@ class Stat extends \app\BaseController
 	ifnull(week_thfee,0) as wthfee,
 	ifnull(day_thfee,0) as thfee,
 	ifnull(a.platform_name,'') as p 
-FROM
+    FROM
 	(
 	SELECT MONTH
 		( a.addtime ) AS `month`,