|
|
@@ -95,16 +95,14 @@ class Sale extends Base
|
|
|
return error_show(1003,"库存数量不足");
|
|
|
}
|
|
|
}
|
|
|
- $origin = Db::name("good_nake")->where([["spuCode","=",$spuCode],["min_num","<=",$good_num],["is_del","=",
|
|
|
- 0]])->order("min_num desc")->find();
|
|
|
+ $origin = Db::name("good_nake")->where([["spuCode","=",$spuCode],["min_num","<=",$good_num],["is_del","=",0]])->order("min_num desc")->find();
|
|
|
if($origin==false){
|
|
|
return error_show(1003,"未找到相关阶梯成本价格");
|
|
|
}
|
|
|
$origin_price = $origin['nake_total'];
|
|
|
$sale_price = isset($this->post['good_price'])&&$this->post['good_price']!="" ? floatval($this->post['good_price']):0;
|
|
|
if($goodtype==1){
|
|
|
- $good = Db::name("good_ladder")->where(["skuCode"=>$skuCode,"is_del"=>0,"status"=>1])->where([["min_num",
|
|
|
- "<=",$good_num]])->order("min_num desc")->find();
|
|
|
+ $good = Db::name("good_ladder")->where(["skuCode"=>$skuCode,"is_del"=>0,"status"=>1])->where([["min_num","<=",$good_num]])->order("min_num desc")->find();
|
|
|
if($good==false){
|
|
|
return error_show(1003,"未找到相关阶梯价格");
|
|
|
}
|
|
|
@@ -143,7 +141,7 @@ class Sale extends Base
|
|
|
"good_num"=>$good_num,
|
|
|
"good_type"=>$goodtype,
|
|
|
"order_type"=>$is_stock==1?1:2,
|
|
|
- "createrid"=>$origin['createrid'],
|
|
|
+ "createrid"=>$origin['creater_id'],
|
|
|
"creater"=>$origin['creater'],
|
|
|
'send_way'=>2
|
|
|
|
|
|
@@ -1474,7 +1472,7 @@ class Sale extends Base
|
|
|
"demo_fee"=>$good['demo_fee'],
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_type"=>1,
|
|
|
- "createrid"=>$origin['createrid'],
|
|
|
+ "createrid"=>$origin['creater_id'],
|
|
|
"creater"=>$origin['creater'],
|
|
|
"order_type"=>$good['is_stock']==1?1:2,
|
|
|
'send_way'=>2
|
