|
|
@@ -97,7 +97,7 @@ class Sale extends Base
|
|
|
if($origin==false){
|
|
|
return error_show(1003,"未找到相关阶梯成本价格");
|
|
|
}
|
|
|
- $origin_price = $origin['nake_fee'];
|
|
|
+ $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",
|
|
|
@@ -122,10 +122,6 @@ class Sale extends Base
|
|
|
$sale_price=$act['activity_price'];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
$cgd=[
|
|
|
"supplierNo"=>$ct['supplierNo'],
|
|
|
"companyNo"=>$supplierNo,
|
|
|
@@ -382,7 +378,7 @@ class Sale extends Base
|
|
|
"good_name"=>$data['good_name'],
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_price"=>$data['sale_price'],
|
|
|
- "total_fee"=>$data['total_fee'],
|
|
|
+ "total_fee"=>round($data['sale_price']*$data['good_num'],2),
|
|
|
"pakge_fee"=>$data['pakge_fee'],
|
|
|
"cert_fee"=>$data['cert_fee'],
|
|
|
"open_fee"=>$data['open_fee'],
|
|
|
@@ -634,7 +630,7 @@ class Sale extends Base
|
|
|
"skuCode"=>$skuCode,
|
|
|
"orderCode"=>$orderCode,
|
|
|
"good_name"=>$zxinfo['good_name'],
|
|
|
- "sale_price"=>$sale_price,
|
|
|
+ "sale_price"=>$zxinfo['origin_price'],
|
|
|
"total_fee"=>$zxinfo['total_fee'],
|
|
|
"pakge_fee"=>$zxinfo['pakge_fee'],
|
|
|
"cert_fee"=>$zxinfo['cert_fee'],
|
|
|
@@ -1204,7 +1200,7 @@ class Sale extends Base
|
|
|
if($origin==false){
|
|
|
return false;
|
|
|
}
|
|
|
- $origin_price = $origin['nake_fee'];
|
|
|
+ $origin_price = $origin['nake_total'];
|
|
|
$orderCode=makeNo("QR");
|
|
|
$datas=[
|
|
|
"orderCode"=>$orderCode,
|
