ad

app/admin/controller/Consult.php

@@ -443,7 +443,7 @@ class Consult extends Base
             return error_show(1004,"未找到咨询信息数据");
         }
         $cat =Db::name("cat")->where(["id"=>$zxinfo['cat_id']])->find();
-        $budget = isset($cat['order_rate']) ? $cat['order_rate']:100;
+        $budget = isset($cat['order_rate']) ? $cat['order_rate']:0;
         $zxinfo['can']= isset($zxinfo['cat_id']) && $zxinfo['cat_id'] !=0 ? made($zxinfo['cat_id'],[]):[];
         $zxinfo['khname']="";
         $zxinfo['original_price']=sprintf("%.2f",$zxinfo['budget_price']* (1 -$budget/100));
@@ -804,7 +804,7 @@ class Consult extends Base
         $bidNo=makeNo("BD");
         $spucode=makeNo("SPU");
         $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:1;
+        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
         if($is_gold_price==1){
             $gold = Db::name("gold_price1")->where(["type"=>$metal_id,"is_del"=>0,"status"=>1])->order("addtime desc")
                 ->find();
@@ -979,7 +979,7 @@ class Consult extends Base
         }
         $catinfo = Db::name("cat")->where(["id"=>$info['cat_id']])->find();
         $bidinfo = Db::name("consult_info")->where(["infoNo"=>$info["infoNo"]])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
+        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
         $god=[
             "metal_id"=>$info['metal_id'],
             "weight"=>$info["weight"],
@@ -995,11 +995,10 @@ class Consult extends Base
         ];
         if($info['is_gold_price']==1){
             $price = GoldPrice($god, $budget/100);
-        }else{
-            $price = GoodPrice($god, $budget/100);
+            $info['sale_price'] =round($price,2);
         }
         $info['specinfo'] = json_decode($info['specinfo'],true);
-        $info['sale_price'] =round($price,2);
+
         $info['metal_name']=isset($info['metal_id'])&& $info['metal_id']!=0?$this->noble[$info['metal_id']]:"";
         $bargain =Db::name("bargain_order")->where(['bidsNo'=>$bidNo,"is_del"=>0])->find();
         $info['bargain'] =$bargain;
@@ -1082,8 +1081,8 @@ class Consult extends Base
         $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         $remark = isset($this->post['remark'])&&$this->post['remark']!=""? trim($this->post['remark']):"";
         $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:1;
-        if($is_gold_price=1){
+        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
+        if($is_gold_price==1){
             $gold = Db::name("gold_price1")->where(["type"=>$metal_id,"is_del"=>0,"status"=>1])->order("addtime desc")
                 ->find();
             $total_fee = $open_fee/$zxinfo['num'] + $weight* $gold["price"] + $cost_fee*
@@ -1408,7 +1407,7 @@ class Consult extends Base
         $unit =Db::name("unit")->where(["id"=>$bidinfos['unit_id']])->find();
         $info['unit'] = isset($unit['unit'])?$unit['unit']:'';
         $bidinfoe = Db::name("consult_info")->where(["infoNo"=>$info["infoNo"]])->find();
-        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
+        $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
         $info['budget'] =$budget;
         $god=[
             "metal_id"=>$bidinfos['metal_id'],
@@ -1528,7 +1527,7 @@ class Consult extends Base
                 $value["brand_id"]="";
             }
             $bidinfo = Db::name("consult_info")->where(["infoNo"=>$value["infoNo"]])->find();
-            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
+            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
                 $god=[
                     "metal_id"=>$value['metal_id'],
                     "weight"=>$value["weight"],
@@ -1603,7 +1602,7 @@ class Consult extends Base
                 $value["brand_id"]="";
             }
             $bidinfo = Db::name("consult_info")->where(["infoNo"=>$value["infoNo"]])->find();
-            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
+            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
             $god=[
                 "metal_id"=>$value['metal_id'],
                 "weight"=>$value["weight"],
@@ -1619,11 +1618,10 @@ class Consult extends Base
             ];
             if($value['is_gold_price']==1){
                 $price = GoldPrice($god, $budget/100);
-            }else{
-                $price = GoodPrice($god, $budget/100);
+                $value['sale_price'] =round($price,2);
             }
             $value['metal_name']=isset($value['metal_id'])&& $value['metal_id']!=0?$this->noble[$value['metal_id']]:"";
-            $value['sale_price'] =round($price,2);
+
             $value['specinfo'] = json_decode($value['specinfo'],true);
             $value['bargain_status']=$bidinfo['bargain_status'];
             $data[]=$value;
@@ -1681,7 +1679,7 @@ class Consult extends Base
             $unit =Db::name("unit")->where(["id"=>$bidinfos['unit_id']])->find();
             $value['unit'] = isset($unit['unit'])?$unit['unit']:'';
             $bidinfoe = Db::name("consult_info")->where(["infoNo"=>$value["infoNo"]])->find();
-            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:100;
+            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
             $value['budget'] =$budget;
             $god=[
                 "metal_id"=>$bidinfos['metal_id'],

app/admin/controller/Goodup.php

@@ -370,6 +370,8 @@ class Goodup extends BaseController
                 }
                 if($good_ladder!=="" && !empty($good_ladder)){
                     $temp=[];
+                    $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
+                    $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
                     foreach ($good_ladder as $value){
                         $lemp=[];
                         $lemp['spuCode']=$spucode;
@@ -831,6 +833,26 @@ class Goodup extends BaseController
         $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;
+        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) ;
+            }
+        }
         $data["nakelist"]=!empty($nakelist)?$nakelist:[];
         return app_show(0,"获取成功",$data);
     }

app/admin/controller/Orderback.php

@@ -284,6 +284,36 @@ class Orderback extends \app\BaseController
         if($status===""){
             return error_show(1004,"参数status不能为空");
         }
+        $return_wsm=isset($this->post["return_wsm"])&&$this->post["return_wsm"]!=""?trim($this->post["return_wsm"]):"";
+
+        $normal_num=isset($this->post["normal_num"])&&$this->post["normal_num"]!=""?intval($this->post["normal_num"])
+            :"";
+        $defective_wsm=isset($this->post["defective_wsm"])&&$this->post["defective_wsm"]!=""?trim($this->post["defective_wsm"]):"";
+
+        $defective_num=isset($this->post["defective_num"])&&$this->post["defective_num"]!==""?intval($this->post["defective_num"]):"";
+        $loss_num=isset($this->post["loss_num"])&&$this->post["loss_num"]!=""?intval($this->post["loss_num"]):"";
+        if($status==4){
+            if($defective_num===""){
+                return error_show(1004,"参数defective_num不能为空");
+            }
+            if($loss_num===""){
+                return error_show(1004,"参数loss_num不能为空");
+            }
+            if($normal_num===""){
+                return error_show(1004,"参数normal_num不能为空");
+            }
+            if($defective_wsm===""){
+                return error_show(1004,"参数defective_wsm不能为空");
+            }
+            if($return_wsm===""){
+                return error_show(1004,"参数return_wsm不能为空");
+            }
+            $info['return_wsm']=$return_wsm;
+            $info['loss_num']=$loss_num;
+            $info['normal_num']=$normal_num;
+            $info['defective_wsm']=$defective_wsm;
+            $info['defective_num']=$defective_num;
+        }
         $remark= isset($this->post['remark']) && $this->post['remark']!="" ? trim($this->post['remark']):"";
         Db::startTrans();
         try{

app/admin/route/app.php

@@ -454,4 +454,7 @@ Route::rule("excluedit","admin/Exclusive/edit");
 Route::rule("consultorder","admin/Sale/consultOrder");
 Route::rule("projectorder","admin/Sale/projectCreate");
 
+Route::rule("aftersetwsm","admin/After/setWsm");
+Route::rule("setdelivery","admin/After/setdelivery");
+