Merge branch 'zjl_commit_20200526'

app/Http/Controllers/OrderController.php

@@ -2088,7 +2088,7 @@ Class OrderController extends Controller
             $tmp['brand']           = $value['brand_name'];
             $tmp['brand']           = $value['brand_name'];
             $tmp['nums']            = $value['goods_number'];
             $tmp['nums']            = $value['goods_number'];
             $tmp['currency']        = $info['order_info']['currency'] == 1?'人民币':'美元';
             $tmp['currency']        = $info['order_info']['currency'] == 1?'人民币':'美元';
-            $tmp['totalPrice']      = $value['goods_amount'];
+            $tmp['totalPrice']      = number_format($value['goods_number'] * $value['single_pre_price'], 2, '.', '');
             $tmp['remarks']         = $value['remarks'];
             $tmp['remarks']         = $value['remarks'];
             $tmp['material']        = $value['erp_rec_id'];
             $tmp['material']        = $value['erp_rec_id'];
             $tmp['purchasing']      = !empty($value['buyerName'])?$value['buyerName']:'';        
             $tmp['purchasing']      = !empty($value['buyerName'])?$value['buyerName']:'';