ad

app/admin/controller/Activity.php

@@ -691,7 +691,7 @@ class Activity extends Base
       if($skuCode==""){
           return error_show(1004,"参数skuCode不能为空");
       }
-      $where=['a.is_del'=>0,"b.is_del"=>0,"a.status"=>3,"b.status"=>1,"b.skuCode"=>$skuCode];
+      $where=['a.is_del'=>0,"b.is_del"=>0,"a.status"=>6,"b.status"=>1,"b.skuCode"=>$skuCode];
       $condition=['a.skuCode' =>$skuCode,"a.is_del"=>0,'a.exam_status'=>3];
       $company =  isset($this->post['companyNo'])&&$this->post['companyNo']!=""?trim($this->post['companyNo']):"";
       if($company!=""){

app/admin/controller/Consult.php

@@ -749,7 +749,7 @@ class Consult extends Base
         $cost_fee = isset($this->post['cost_fee'])&&$this->post['cost_fee']!==""? floatval($this->post['cost_fee']):"0";
         if($nake_fee===""  ){
             return error_show(1004,"参数nake_fee不能为空");
-            }
+        }
         $is_diff = isset($this->post['is_diff'])&&$this->post['is_diff']!==""? intval($this->post['is_diff']):"";
         $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']):"";

app/admin/controller/Sale.php

@@ -1148,6 +1148,7 @@ class Sale extends Base
                     "send_way" => $zxinfo['send_way'],
                     "companyNo" => $companyNo,
                     "companyName" =>$companyinfo['data'][$companyNo]??"",
+                    'sale_price' => $sale_price,
                     "status" => 1,
                     "is_combind" => $zxinfo['is_combind'],
                     "is_del" => 0,
@@ -1721,6 +1722,7 @@ class Sale extends Base
                 "supply_area" => $goodinfo['supply_area'],
                 "pay_way" => $goodinfo['pay_way'],
                 "send_way" => $goodinfo['send_way'],
+                'sale_price' => $data['sale_price'],
                 "status" => 1,
                 "is_del" => 0,
                 "order_type" => 3,

app/admin/model/GoodCombind.php

@@ -33,7 +33,7 @@ class GoodCombind extends Model
 		                 ->where(['spuCode'=>$row['childCode'] , 'wsm_type'=>[2 , 5]])
 		                 ->sum('usable_stock');
 	}
-	
+
 	public function  AddStock($spuCode='',$num="0"){
 		$comblist = $this->where(['spuCode'=>$spuCode,'is_del'=>0])->select()->toArray();
 		if(empty($comblist))throw new \Exception("未找到对应子商品信息");

app/command/SplitSale.php

@@ -212,7 +212,7 @@ class SplitSale extends Command
         } catch (\Exception $exception) {
             $output->writeln('脚本执行出错,' . $exception->getMessage() . '||' . $exception->getFile() . '||' . $exception->getLine());
         }
-
+          Cache::store('redis')->dec($key);
     }
 
     //构建销售单