Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Good.php

@@ -243,7 +243,7 @@ class Good extends Base
         $nakearry=[];
         if(!empty($nakelist)){
             foreach ($nakelist as $value){
-                $value['sale_price'] =$data['nake_total'];
+                $value['sale_price'] =$value['nake_total'];
                 $nakearry[]=$value;
             }
         }

app/admin/controller/Project.php

@@ -317,10 +317,16 @@ class Project extends Base
             if($value['data_source']==1){
                 $good=Db::name("good_platform")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where
                 (["a.skuCode"=>$value['skuCode'],"a.is_del"=>0])->find();
+                $nake = Db::name("good_nake")->where([["spuCode","=",$value['spuCode']],["min_num","<=",
+                    $value["num"]],["is_del","=",0]])->order("min_num desc")->find();
                 $good['unit_id'] = isset($good['good_unit'])?$good['good_unit']:"";
                 $good['cost_desc'] = isset($good['craft_desc'])?$good['craft_desc']:"";
-                $good['pakge_fee'] = isset($good['packing_fee'])?$good['packing_fee']:"0";
-                $good['nake_fee'] = isset($good['nake_price'])?$good['nake_price']:"0";
+                $good['pakge_fee'] = isset($nake['package_fee'])?$nake['package_fee']:"0";
+                $good['mark_fee'] = isset($nake['mark_fee'])?$nake['mark_fee']:"0";
+                $good['other_fee'] = isset($nake['other_fee'])?$nake['other_fee']:"0";
+                $good['cert_fee'] = isset($nake['cert_fee'])?$nake['cert_fee']:"0";
+                $good['delivery_fee'] = isset($nake['delivery_fee'])?$nake['delivery_fee']:"0";
+                $good['nake_fee'] = isset($nake['nake_fee'])?$nake['nake_fee']:"0";
                 $good['metal_id'] = isset($good['noble_metal'])?$good['noble_metal']:"0";
                 $spec = Db::name("good_spec")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->select()->toArray();
                 $good['specinfo']=[];
@@ -342,7 +348,7 @@ class Project extends Base
                     true):"";
                 $catinfo = Db::name("cat")->where(["id"=>$good['cat_id']])->find();
                 $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
-                $god=[
+                $good=[
                     "metal_id"=>$good['metal_id'],
                     "weight"=>$good["weight"],
                     "demo_fee"=>$good["demo_fee"],