Ver Fonte

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

wugg há 3 anos atrás
pai
commit
4643ce3fb1
1 ficheiros alterados com 6 adições e 2 exclusões
  1. 6 2
      app/admin/controller/Project.php

+ 6 - 2
app/admin/controller/Project.php

@@ -179,12 +179,16 @@ class Project extends Base
                     if($source==1){
                         $ladd = Db::name("good_ladder")->where([["skuCode","=",$value['skuCode']],["min_num","<=",
                             $projectinfo["num"]],["status","=",1],["is_del","=",0]])->order("min_num desc")->find();
+                        $nake =Db::name("good_nake")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->where([["min_num","<=",$projectinfo['num']]])
+                            ->order("min_num desc")->find();
+                        $origin_price=isset($nake['nake_total'])?$nake['nake_total']:"0" ;
                         $sale_price = $ladd['sale_price'];
                     }else{
                         $sale_price =$value['sale_price'];
+                        $origin_price =$value['sale_price'];
                     }
                     $temp['sale_price']=$sale_price;
-                    $temp['origin_price']=$sale_price;
+                    $temp['origin_price']=$origin_price;
                     $temp['num']=$projectinfo['num'];
                     $temp['status']=0;
                     $temp['is_del']=0;
@@ -341,7 +345,7 @@ class Project extends Base
                 }
                 $nake =Db::name("good_nake")->where(["spuCode"=>$good['spuCode'],"is_del"=>0])->where([["min_num","<=",$value['num']]])
                     ->order("min_num desc")->find();
-                $good['origin_price']=$nake['nake_fee'];
+                $good['origin_price']=$nake['nake_total'];
             }else{
                 $good=Db::name("consult_bids")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $good['specinfo'] = isset($good['specinfo'])&&$good['specinfo']!=""?json_decode($good['specinfo'],