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

app/admin/controller/Allot.php

@@ -59,6 +59,17 @@ class Allot extends BaseController
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_out',"in",$wsmcode];
         }
+        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !== "" ? trim($this->post['out_companyNo']) : "";
+        if ($out_companyNo !== "") {
+
+            $where[]=["out_companyNo","=",$out_companyNo];
+        }
+        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !== "" ? trim
+        ($this->post['in_companyNo']) : "";
+        if ($in_companyNo !== "") {
+
+            $where[]=["in_companyNo","=",$in_companyNo];
+        }
 
         $in_supplierNo =isset($this->post['wsm_in_supplierNo']) &&$this->post['wsm_in_supplierNo'] !=="" ? trim
         ($this->post['wsm_in_supplierNo']):"";
@@ -111,6 +122,22 @@ class Allot extends BaseController
     if($wsm_in==""){
         return error_show(1002,"入库仓库不能为空");
     }
+        $in_companyNo = isset($this->post['in_companyNo']) && $this->post['in_companyNo'] !=="" ? trim($this->post['in_companyNo']) :"";
+        if($in_companyNo==""){
+            return error_show(1002,"in_companyNo不能为空");
+        }
+        $out_companyNo = isset($this->post['out_companyNo']) && $this->post['out_companyNo'] !=="" ? trim($this->post['out_companyNo']) :"";
+        if($out_companyNo==""){
+            return error_show(1002,"out_companyNo不能为空");
+        }
+        $company =Db::name("business")->where(['companyNo'=>$in_companyNo,"is_del"=>0])->find();
+        if($company==false){
+            return error_show(1002,"未找到入库业务公司");
+        }
+        $company =Db::name("business")->where(['companyNo'=>$out_companyNo,"is_del"=>0])->find();
+        if($company==false){
+            return error_show(1002,"未找到出库业务公司");
+        }
 //    $good_type_code = isset($this->post['good_type_code']) && $this->post['good_type_code'] !=="" ? trim($this->post['good_type_code']) :"";
 //    if($good_type_code==""){
 //        return error_show(1002,"商品属性不能为空");
@@ -144,6 +171,8 @@ class Allot extends BaseController
                 "allot_code"=>$allot_code,
                 "wsm_out"=>$wsm_out,
                 "wsm_in"=>$wsm_in,
+                "out_companyNo"=>$out_companyNo,
+                "in_companyNo"=>$in_companyNo,
                 "apply_name"=>$ri,
                 "apply_id"=>$rm,
                 "post_name"=>$post_name,

app/admin/controller/Check.php

@@ -27,7 +27,7 @@ public function __construct(App $app)
 public function flist(){
     $page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
     $size = isset($this->post['size']) &&$this->post['size'] !=="" ? intval($this->post['size']):10;
-    $condtion=[['a.is_del',"=",0],['b.is_del',"=",0],['c.is_del',"=",0]];
+    $condtion=[['b.is_del',"=",0],['c.is_del',"=",0]];
     $wsmcode =isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code']):"";
     if($wsmcode!==""){
         //return error_show(1002,"仓库code不能为空");
@@ -35,21 +35,21 @@ public function flist(){
        // $typecode= Db::name("good_stock")->where(["wsm_code"=>$wsmcode,'is_del'=>0])->column("good_type_code");
     }
 
-    $good_code =isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
-    if($good_code!=""){
-        $condtion[]=['b.type_code',"=",$good_code];
-    }
+//    $good_code =isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
+//    if($good_code!=""){
+//        $condtion[]=['b.type_code',"=",$good_code];
+//    }
     $goodcode =isset($this->post['good_code']) &&$this->post['good_code'] !=="" ? trim($this->post['good_code'])
         :"";
     if($goodcode!=""){
        // $condtion['a.good_code'] = Db::raw("like '%{$goodcode}%'");
-        $condtion[]=['a.good_code',"like","%{$goodcode}%"];
+        $condtion[]=['b.spuCode',"like","%{$goodcode}%"];
     }
     $good_name =isset($this->post['good_name']) &&$this->post['good_name'] !=="" ? trim($this->post['good_name'])
         :"";
     if($good_name!=""){
       //  $condtion['a.good_name'] = Db::raw("like '%{$good_name}%'");
-        $condtion[]=['a.good_name',"like","%{$good_name}%"];
+        $condtion[]=['b.good_name',"like","%{$good_name}%"];
     }
     $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
     if($supplierNo!=""){
@@ -57,10 +57,15 @@ public function flist(){
         if(empty($supplier)){
             return error_show(1004,"未找到供应商信息");
         }
-                $wsmcode = Db::name("warehouse_info")->where(["wsm_type"=>1,"is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
-        //$condtion["c.wsm_code"] = $wsmcode;
+        $wsmcode = Db::name("warehouse_info")->where(["wsm_type"=>1,"is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
         $condtion[]=['c.wsm_code',"in",$wsmcode];
     }
+    $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+    if ($companyNo !== "") {
+        $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column
+        ("wsm_code");
+        $condition[]=["c.wsm_code","in",$wsmcode];
+    }
     $stock_low =isset($this->post['stock_low']) &&$this->post['stock_low'] !=="" ? intval($this->post['stock_low'])
         :"";
     if($stock_low!=""){
@@ -80,13 +85,11 @@ public function flist(){
     $warn_low =isset($this->post['warn_low']) &&$this->post['warn_low'] !=="" ? intval($this->post['warn_low'])
         :"";
     if($warn_low!==""){
-      //  $condtion['c.warn_stock'] = Db::raw(">= $warn_low");
         $condtion[]=['c.warn_stock',">=",$warn_low];
     }
     $warn_up =isset($this->post['warn_up']) &&$this->post['warn_up'] !=="" ? intval($this->post['warn_up'])
         :"";
     if($warn_up!=""){
-      //  $condtion['c.warn_stock'] = Db::raw("<= {$warn_up}");
         $condtion[]=['c.warn_stock',"<=",$warn_up];
     }
     $cat_id =isset($this->post['cat_id']) &&$this->post['cat_id'] !=="" ? intval($this->post['cat_id']) :"";
@@ -96,19 +99,15 @@ public function flist(){
             return error_show(1004,"未找到分类信息");
         }
         $cat=manger([$at['id']],$at['level']);
-        $condtion[]=['a.cat_id',"in",$cat];
+        $condtion[]=['b.cat_id',"in",$cat];
     }
-    $count = Db::name("good_type")->alias("b")
-        ->join("good a","a.good_code = b.good_code","left")
-        ->join("good_stock c","c.good_type_code=b.type_code","left")
+    $count = Db::name("good")->alias("b")
+        ->join("good_stock c","c.spuCode=b.spuCode","left")
         ->where($condtion)->count();
     $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
-    $list = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
-        ->join("good_stock c","c.good_type_code=b.type_code","left")
-        ->where($condtion)->field("c.id,a.good_code,a.good_name,a.good_desc,a.brand,a.original_price,a.cg_saler,a.good_type,a.market_fee,a.gys_code,a.unit,
-                a.sort_f,a.sort_s,a.sort_t,b.color,b.material,b.specs,b.is_main,b.type_code,b.attribute,b.status as bstatus,a.addtime,c.wsm_code,c.usable_stock,c.warn_stock,a.updatetime,a.cat_id")
-        ->page($page,$size)->select();
-   // var_dump(Db::name("good_type")->getLastSql());
+    $list = Db::name("good")->alias("b")
+        ->join("good_stock c","c.spuCode=b.spuCode","left")
+        ->where($condtion)->page($page,$size)->select();
     $data=[];
     foreach ($list as $key=>$value){
         $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
@@ -167,6 +166,10 @@ public function list()
        // $where['a.status '] = $status;
         $where[]=['a.status',"=",$status];
     }
+    $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+    if ($companyNo !== "") {
+        $condition[]=["a.companyNo ","=",$companyNo ];
+    }
     $count = Db::name('good_check')->alias('a')->join("warehouse_info b","a.wsm_code = b.wsm_code","left")
         ->join("supplier v","v.code=b.supplierNo","left")
         ->where($where)->count();
@@ -223,6 +226,14 @@ public function create(){
     if($type==""){
         return error_show(1002,"盘点类型不能为空");
     }
+    $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !=="" ? trim($this->post['companyNo']) :"";
+    if($companyNo==""){
+        return error_show(1002,"参数companyNo不能为空");
+    }
+    $company =Db::name("business")->where(['companyNo'=>$companyNo,"is_del"=>0])->find();
+    if($company==false){
+        return error_show(1002,"未找到业务公司");
+    }
     $check_code = makeNo("CK");
     $apply_id=GetUserInfo($token);
     if(empty($apply_id)||$apply_id['code']!=0){
@@ -256,6 +267,7 @@ public function create(){
             "wsm_code"=>$wsm_code,
             "type"=>$type,
             "status"=>$status,
+            "companyNo"=>$companyNo,
             "remark"=>$remark,
             "apply_id"=>$rm,
             "apply_name"=>$ri,

app/admin/controller/Consult.php

@@ -92,6 +92,11 @@ class Consult extends Base
             // $where['khNo'] = $khNo;
             $where[]= ["b.khNo",'like',"%$khNo%"];
         }
+        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+        if ($companyNo !== "") {
+            // $where['khNo'] = $khNo;
+            $where[]= ["b.companyNo",'like',"%$companyNo%"];
+        }
         $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
         if ($start !="") {
             //$where = ["zxtime"=>Db::raw(">= '{$start}'")];

app/admin/controller/Good.php

@@ -239,24 +239,11 @@ class Good extends Base
         $data["ladderlist"]=!empty($ladder)?$ladder:[];
         $nakelist = Db::name("good_nake")->where(['spuCode'=>$good_platform['spuCode'],"is_del"=>0])->select()->toArray();
         $catinfo = Db::name("cat")->where(["id"=>$data['cat_id']])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
+       // $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
         $nakearry=[];
         if(!empty($nakelist)){
             foreach ($nakelist as $value){
-                if($data['is_gold_price']==1){
-                    $gold = Db::name("gold_price1")->where(["type"=>$data['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
-                        ->find();
-//                    $total_fee = $data['open_fee']/$value['min_num'] + $data['weight']*$gold["price"] + $data['cost_fee']/(1-$budget)*
-//                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                    $saleprice = $data['open_fee']/$value['min_num'] + $data['weight']*$gold["price"] + $data['cost_fee']*
-                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                }else{
-                    //  $total_fee = $data['open_fee']/$value['min_num']+
-                    // $data['cost_fee']*$data['weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                    $saleprice = $data['open_fee']/$value['min_num'] + $data['cost_fee']*
-                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee']/(1-$budget);
-                }
-                $value['sale_price'] =round($saleprice,2) ;
+                $value['sale_price'] =$data['nake_total'];
                 $nakearry[]=$value;
             }
         }
@@ -366,7 +353,12 @@ class Good extends Base
       $suplierNo = isset($this->post['suplierNo']) &&$this->post['suplierNo'] !=="" ? trim($this->post['suplierNo'])
           :"";
       if($suplierNo!==""){
-          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $condition[]=["wsm_code","in",$wsmcode];
+      }
+      $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+      if ($companyNo !== "") {
+          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $start = isset($this->post['start']) &&$this->post['start'] !=="" ? $this->post['start']:"";
@@ -392,16 +384,16 @@ class Good extends Base
           $temp['wsm_code']=$value['wsm_code'];
           $temp['supplier_code']=isset($wsm['code'])?$wsm['code']:"";
           $temp['supplier_name']=isset($wsm['name'])?$wsm['name']:"";
-          if($value['good_type_code']!=""){
-              $good=Db::name("good_type")->alias("a")->join("good b","a.good_code=b.good_code","left")->where(["a.type_code"=>$value['good_type_code'],"a.is_del"=>0,"b.is_del"=>0])
-                  ->field("a.good_code,a.type_code,b.good_name,b.unit,a.attribute,b.sort_f")->find();
+          if($value['spuCode']!=""){
+              $good=Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
           }
-          $temp['good_code']=isset($good['good_code'])?$good['good_code']:"";
-          $temp['type_code']=isset($good['type_code'])?$good['type_code']:"";
+          $temp['good_code']=isset($good['spuCode'])?$good['spuCode']:"";
+        //  $temp['type_code']=isset($good['type_code'])?$good['type_code']:"";
           $temp['good_name']=isset($good['good_name'])?$good['good_name']:"";
           $temp['unit']=isset($good['unit'])?$good['unit']:"";
-          $temp['attribute']=isset($good['attribute'])?$good['attribute']:"";
-          $temp['sort_f']=isset($good['sort_f'])?$good['sort_f']:"";
+        //  $temp['attribute']=isset($good['attribute'])?$good['attribute']:"";
+          $temp['sort_f']=isset($good['cat_id'])?$good['cat_id']:"";
+          $temp['cat_info']=isset($good['cat_id'])?made($good['cat_id']):"";
           $temp['usable_stock'] = $value['usable_stock'];
           $temp['wait_in_stock'] = $value['wait_in_stock'];
           $temp['wait_out_stock'] = $value['wait_out_stock'];
@@ -436,7 +428,12 @@ class Good extends Base
       $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
           :"";
       if($suplierNo!==""){
-          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $condition[]=["wsm_code","in",$wsmcode];
+      }
+      $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+      if ($companyNo !== "") {
+          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $build= Db::name("good_stock")->where($condition)->group("wsm_code")->field("wsm_code")->buildSql();
@@ -452,10 +449,9 @@ class Good extends Base
               $wsm = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")->where
               (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")
                   ->find();
-              $good = Db::name("good_stock")->alias("a")->join("good_type b","a.good_type_code=b.type_code","left")
-                  ->join("good c","c.good_code=b.good_code","left")->where(["a.wsm_code"=>$value['wsm_code'],"a.is_del"=>0,"b.is_del"=>0,"c.is_del"=>0])
-                  ->field("c.good_code,a.good_type_code,c.good_name,b.attribute,c.sort_f,c.unit,a.usable_stock,a.wait_in_stock,a.wait_out_stock,a.intra_stock,a.total_stock,a.warn_stock")
-                  ->select();
+              $good = Db::name("good_stock")->alias("a")
+                  ->join("good c","c.spuCode=a.spuCode","left")->where(["a.wsm_code"=>$value['wsm_code'],"a
+                  .is_del"=>0,"c.is_del"=>0])->select();
           }
           $temp['wsm_name'] = isset($wsm['wsm_name'])?$wsm['wsm_name']:"";
           $temp['wsm_code']=$value['wsm_code'];
@@ -537,6 +533,12 @@ class Good extends Base
             $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
+        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+        if ($companyNo !== "") {
+            // $where['khNo'] = $khNo;
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+            $condition[]=["wsm_code","in",$wsmcode];
+        }
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
         if($type_code!=""){
             $condition[] = ["good_type_code","=",$type_code];
@@ -604,28 +606,33 @@ class Good extends Base
                 return error_show(1004,"未找到供应商信息");
             }
             $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$supplierNo])->column("wsm_code");
+                "is_del"=>0,"wsm_type"=>5,"supplierNo"=>$supplierNo])->column("wsm_code");
             $where[]=['b.wsm_code',"in",$wsmcode];
         }
+        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+        if ($companyNo !== "") {
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column
+            ("wsm_code");
+            $condition[]=["b.wsm_code","in",$wsmcode];
+        }
         $count = Db::name("good_log")->alias('a')
-            ->join("good_stock b","b.id=a.id","left")->where($where)
-            ->join("good_type c","c.type_code=b.good_type_code","left")
-            ->join("good v","v.good_code=c.good_code","left")->count();
+            ->join("good_stock b","b.id=a.id","left")->where($where)->count();
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
         $list = Db::name("good_log")->alias('a')
             ->join("good_stock b","b.id=a.stock_id","left")
-            ->join("good_type c","c.type_code=b.good_type_code","left")
-            ->join("good v","v.good_code=c.good_code","left")
             ->where($where)->page($page,$size)->order("a.addtime desc")
-            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,
-            a.addtime,a.action_uid,b.wsm_code,v.good_code,v.good_name,v.cat_id")->select();
+            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,b.spuCode,
+            a.addtime,a.action_uid,b.wsm_code")->select();
        $data=[];
         foreach ($list as $value){
             $db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
             $item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
             $wsm = Db::name("warehouse_info")->alias("a")->Join("supplier b","a.supplierNo=b.code","left")->where
             (['a.wsm_code'=>$value['wsm_code'],"a.wsm_type"=>1,"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
+            $godd =Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
+            $value['good_name']=isset($godd['good_name'])? $godd['good_name']:"";
+            $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";
             $int = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $value['wsm_name'] =$wsm['wsm_name'];
             $value['wsm_code'] =$wsm['wsm_code'];

app/admin/controller/Goodup.php

@@ -376,6 +376,8 @@ class Goodup extends Base
                         return app_show(1004,"商品规格值创建失败");
                     }
                 }
+                $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
+                $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
                 if($good_ladder!=="" && !empty($good_ladder)){
                     $temp=[];
                     foreach ($good_ladder as $value){
@@ -385,6 +387,16 @@ class Goodup extends Base
                         $lemp['nake_fee'] = $value['nake_fee'];
                         $lemp['cost_fee'] = $value['cost_fee'];
                         $lemp['delivery_fee'] = $value['delivery_fee'];
+                        $lemp['cert_fee'] = $value['cert_fee'];
+                        $lemp['mark_fee'] = $value['mark_fee'];
+                        $lemp['package_fee'] = $value['package_fee'];
+                        $lemp['other_fee'] = $value['other_fee'];
+                        if($is_gold_price==1){
+                            $lemp['nake_total'] =$noble_weight*$cgd_gold_price + $value['cost_fee']*
+                                $noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
+                        }else{
+                            $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
+                        }
                         $lemp['is_del'] = 0;
                         $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
@@ -713,6 +725,16 @@ class Goodup extends Base
                         $lemp['nake_fee'] = $value['nake_fee'];
                         $lemp['cost_fee'] = $value['cost_fee'];
                         $lemp['delivery_fee'] = $value['delivery_fee'];
+                        $lemp['cert_fee'] = $value['cert_fee'];
+                        $lemp['mark_fee'] = $value['mark_fee'];
+                        $lemp['package_fee'] = $value['package_fee'];
+                        $lemp['other_fee'] = $value['other_fee'];
+                        if($is_gold_price==1){
+                            $lemp['nake_total'] =$noble_weight*$cgd_gold_price + $value['cost_fee']*
+                                $noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
+                        }else{
+                            $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
+                        }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
@@ -852,26 +874,12 @@ class Goodup extends Base
         $data["speclist"]=empty($speclist)?[]:$speclist;
        // $nake=[];
         $nakelist = Db::name("good_nake")->where(['spuCode'=>$supcode,"is_del"=>0])->select()->toArray();
-        $catinfo = Db::name("cat")->where(["id"=>$data['cat_id']])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
+//        $catinfo = Db::name("cat")->where(["id"=>$data['cat_id']])->find();
+//        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
         $nakearry=[];
         if(!empty($nakelist)){
-            foreach ($nakelist as $value){
-                if($data['is_gold_price']==1){
-                    $gold = Db::name("gold_price1")->where(["type"=>$data['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
-                        ->find();
-//                    $total_fee = $data['open_fee']/$value['min_num'] + $data['weight']*$gold["price"] + $data['cost_fee']/(1-$budget)*
-//                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                    $saleprice = $data['open_fee']/$value['min_num'] + $data['weight']*$gold["price"] + $data['cost_fee']*
-                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                }else{
-                  //  $total_fee = $data['open_fee']/$value['min_num']+
-                    // $data['cost_fee']*$data['weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee'];
-                    $saleprice = $data['open_fee']/$value['min_num'] + $data['cost_fee']*
-                        $data['noble_weight']+$data['mark_fee']+$data['packing_fee']+$data['cert_fee']+$value['nake_fee']/(1-$budget);
-                }
-                $value['sale_price'] =round($saleprice,2) ;
-                $nakearry[]=$value;
+            foreach ($nakelist as $value) {
+                    $nakearry[] = $value;
             }
         }
         $data["nakelist"]=$nakearry;
@@ -1136,7 +1144,6 @@ class Goodup extends Base
                     return app_show(1004,"商品起订价修改失败");
                 }
             }
-
             $up = Db::name("good_platform")->save($platform);
             if($up){
                 $proof=[
@@ -1279,9 +1286,14 @@ class Goodup extends Base
                     $tmp=[];
                     $tmp['spuCode']=$newCode;
                     $tmp['min_num']=$value['min_num'];
-                    $tmp['nake_fee']=$value['nake_fee'];
-                    $tmp['cost_fee']=$value['cost_fee'];
-                    $tmp['delivery_fee']=$value['delivery_fee'];
+                    $tmp['nake_fee'] = $value['nake_fee'];
+                    $tmp['cost_fee'] = $value['cost_fee'];
+                    $tmp['delivery_fee'] = $value['delivery_fee'];
+                    $tmp['cert_fee'] = $value['cert_fee'];
+                    $tmp['mark_fee'] = $value['mark_fee'];
+                    $tmp['package_fee'] = $value['package_fee'];
+                    $tmp['other_fee'] = $value['other_fee'];
+                    $tmp['nake_total'] =$value['nake_total'];
                     $tmp['is_del']=$value['is_del'];
                     $tmp['addtime']=date("Y-m-d H:i:s");
                     $tmp['updatetime']=date("Y-m-d H:i:s");
@@ -1608,6 +1620,16 @@ class Goodup extends Base
                         $lemp['nake_fee'] = $value['nake_fee'];
                         $lemp['cost_fee'] = $value['cost_fee'];
                         $lemp['delivery_fee'] = $value['delivery_fee'];
+                        $lemp['cert_fee'] = $value['cert_fee'];
+                        $lemp['mark_fee'] = $value['mark_fee'];
+                        $lemp['package_fee'] = $value['package_fee'];
+                        $lemp['other_fee'] = $value['other_fee'];
+                        if($is_gold_price==1){
+                            $lemp['nake_total'] =$noble_weight*$cgd_gold_price + $value['cost_fee']*
+                                $noble_weight+$value['mark_fee']+$value['package_fee']+$value['cert_fee']+$value['nake_fee']+$value['delivery_fee']+$value['other_fee'];
+                        }else{
+                            $lemp['nake_total'] =$value['nake_fee']+$value['delivery_fee']+$value['cert_fee']+$value['mark_fee']+$value['package_fee']+$value['other_fee'];
+                        }
                         $lemp['is_del'] = isset($value['is_del'])?$value['is_del']:0;
                         isset($value["id"])&&$value["id"]!=''?"": $lemp['addtime'] = date("Y-m-d H:i:s");
                         $lemp['updatetime'] =date("Y-m-d H:i:s");
@@ -1653,12 +1675,10 @@ class Goodup extends Base
         $catinfo = Db::name("cat")->where(["id"=>$good['cat_id']])->find();
         $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
         if($good['is_gold_price']==1){
-//            $gold = Db::name("gold_price1")->where(["type"=>$good['noble_metal'],"is_del"=>0,"status"=>1])->order("addtime desc")
-//                ->find();
             $saleprice =  $good['noble_weight']*$good["cgd_gold_price"] + $nakelist['cost_fee']/(1-$budget)*
-                $good['noble_weight']+$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['nake_fee']+$nakelist['delivery_fee'];
+                $good['noble_weight']+$nakelist['mark_fee']+$nakelist['package_fee']+$nakelist['cert_fee']+$nakelist['nake_fee']+$nakelist['delivery_fee'];
         }else{
-            $saleprice =$good['mark_fee']+$good['packing_fee']+$good['cert_fee']+$nakelist['delivery_fee']+$nakelist['nake_fee']/(1-$budget);
+            $saleprice =$nakelist['mark_fee']+$nakelist['package_fee']+$nakelist['cert_fee']+$nakelist['delivery_fee']+$nakelist['nake_fee']/(1-$budget);
         }
         return app_show(0,"获取成功",["sale_price"=>round($saleprice,2)]);
     }