wugg vor 3 Jahren
Ursprung
Commit
6739afb6a2
2 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
  1. 4 1
      app/admin/controller/Consult.php
  2. 2 1
      app/admin/controller/Sale.php

+ 4 - 1
app/admin/controller/Consult.php

@@ -766,6 +766,7 @@ class Consult extends Base
         $metal_id = isset($this->post['metal_id'])&&$this->post['metal_id']!=""? intval($this->post['metal_id']):"";
         $is_gold_price = isset($this->post['is_gold_price'])&&$this->post['is_gold_price']!=""? intval($this->post['is_gold_price']):"";
         $config = isset($this->post['config'])&&$this->post['config']!=""? $this->post['config']:"";
+        $other_config = isset($this->post['other_config'])&&$this->post['other_config']!=""? $this->post['other_config']:"";
         $weight = isset($this->post['weight'])&&$this->post['weight']!=""? floatval($this->post['weight']):"";
         $demo_fee = isset($this->post['demo_fee'])&&$this->post['demo_fee']!=""? floatval($this->post['demo_fee']):"";
         $delivery_fee = isset($this->post['delivery_fee'])&&$this->post['delivery_fee']!=""? floatval($this->post['delivery_fee']):"";
@@ -817,6 +818,7 @@ class Consult extends Base
             "metal_id"=>$metal_id,
             "is_gold_price"=>$is_gold_price,
             "config"=>$config,
+            "other_config"=>$other_config,
             "weight"=>$weight,
             "is_diff"=>$is_diff,
             "demo_fee"=>$demo_fee,
@@ -990,6 +992,7 @@ class Consult extends Base
         $metal_id = isset($this->post['metal_id'])&&$this->post['metal_id']!=""? intval($this->post['metal_id']):"";
         $is_gold_price = isset($this->post['is_gold_price'])&&$this->post['is_gold_price']!=""? intval($this->post['is_gold_price']):"";
         $config = isset($this->post['config'])&&$this->post['config']!=""? $this->post['config']:"";
+        $other_config = isset($this->post['other_config'])&&$this->post['other_config']!=""? $this->post['other_config']:"";
         $weight = isset($this->post['weight'])&&$this->post['weight']!=""? floatval($this->post['weight']):"";
         $demo_fee = isset($this->post['demo_fee'])&&$this->post['demo_fee']!=""? floatval($this->post['demo_fee']):"";
         $delivery_fee = isset($this->post['delivery_fee'])&&$this->post['delivery_fee']!=""? floatval($this->post['delivery_fee']):"";
@@ -1023,6 +1026,7 @@ class Consult extends Base
             "metal_id"=>$metal_id,
             "is_gold_price"=>$is_gold_price,
             "config"=>$config,
+            "other_config"=>$other_config,
             "weight"=>$weight,
             "is_diff"=>$is_diff,
             "demo_fee"=>$demo_fee,
@@ -1206,7 +1210,6 @@ class Consult extends Base
         $data=[];
         foreach ($list as $value){
             $catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
-
             $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];
             $unit =Db::name("unit")->where(["id"=>$value['unit_id']])->find();
             $value['unit'] = isset($unit['unit'])?$unit['unit']:'';

+ 2 - 1
app/admin/controller/Sale.php

@@ -1803,7 +1803,8 @@ class Sale extends BaseController
                 return false;
             }
         }else{
-            $order = Db::name("order_num")->where(["orderCode"=>$der['orderCode'],"spuCode"=>$der['spuCode'],"status"=>1])->find();
+            $order = Db::name("order_num")->where(["orderCode"=>$der['orderCode'],"spuCode"=>$der['spuCode'],
+                    "status"=>1])->find();
             if($order==false){
                 return false;
             }else{