修改

core/CoreApp/models/Model_api.php

@@ -870,7 +870,10 @@ function __construct(){
 		]);
 		$price_tmp = isset($v['price'])?$v['price']:"0";
 		$row_total_tmp = isset($v['row_total'])?$v['row_total']:"0";
-		$extra_price = $this->tranExtraPrice($post['issku'],$post['quantity'],$price_tmp,$row_total_tmp);
+		$tax_amount_tmp = isset($v['tax_amount'])?$v['tax_amount']:"0";
+		$discount_amount_tmp = isset($v['discount_amount'])?$v['discount_amount']:"0";
+		
+		$extra_price = $this->tranExtraPrice($post['issku'],$post['quantity'],$price_tmp,$row_total_tmp,$tax_amount_tmp,$discount_amount_tmp);
 		$post['extra_price'] = json_encode($extra_price,JSON_UNESCAPED_UNICODE);
 		$post['shipremarks'] = $matching['title'];
 		$post['cost'] = $matching['cost'];
@@ -881,22 +884,25 @@ function __construct(){
 		return $post;
 	}
 
-	public function tranExtraPrice($issku,$org_qty,$org_price,$org_row_total){
+	public function tranExtraPrice($issku,$org_qty,$org_price,$org_row_total,$org_tax_amount,$org_discount_amount){
 		$sku = explode(',',$issku);
 		$tmp_qty = explode(';',$org_qty);
 		$tmp_price = explode(",",$org_price);
 		$tmp_row_total = explode(",",$org_row_total);
-	
+		$tmp_tax_amount = explode(",",$org_tax_amount);
+		$tmp_discount_amount = explode(",",$org_discount_amount);
 		$extra_price = [];
 		foreach ($sku as $k=>$value) 
 		{
 			$qty = isset($tmp_qty[$k])?$tmp_qty[$k]:0;
 			$price = isset($tmp_price[$k])?$tmp_price[$k]:0;
 			$row_total = isset($tmp_row_total[$k])?$tmp_row_total[$k]:0;
+			$tax_amount = isset($tmp_tax_amount[$k])?$tmp_tax_amount[$k]:0;
+			$discount_amount = isset($tmp_discount_amount[$k])?$tmp_discount_amount[$k]:0;
 			$extra_price[$k] = [
 				'qty'=>$qty,
 				'price'=>$price,
-				'row_total'=>$row_total,
+				'row_total'=> sprintf("%.2f",($row_total*1 - $discount_amount*1 + $tax_amount*1)) ,
 				'sub_total'=>$price*$qty
 			];
 		}