xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Finish mzl_dev

Browse Source
This commit is contained in:
mzl
2025-10-14 12:02:55 +08:00
parent 5f9b4bc471 526812f8ed
commit bc0491f053
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/StockOrdersService.php
+17 -14
View File
@@ -485,12 +485,12 @@ class StockOrdersService
$this->processVehiclePrices($item, $veh); $this->processVehiclePrices($item, $veh);
// 计算利润 // 计算利润
$profit = $this->calculateProfit($veh, $item->mileage, $order); // $profit = $this->calculateProfit($veh, $item->mileage, $order);
$item->addMoney('profit', $order->settlement_currency, $profit, $order->contract_exchange_rate, '利润'); // $item->addMoney('profit', $order->settlement_currency, $profit, $order->contract_exchange_rate, '利润');
// 累计到岸价 // 累计到岸价
$cifTotalAmount += $veh['total_price']['amount'] ?? 0; $cifTotalAmount += $veh['total_price']['amount'] ?? 0;
$profitTotalAmount += $profit; $profitTotalAmount += $veh['profit']['amount'] ?? 0;
// 处理改装项 // 处理改装项
$this->processModificationItems($item->id, $veh['modify_list'] ?? []); $this->processModificationItems($item->id, $veh['modify_list'] ?? []);
@@ -525,17 +525,18 @@ class StockOrdersService
{ {
// 基础费用 // 基础费用
$priceFields = [ $priceFields = [
'unit_price' => '单价', 'unit_price' => '单价',
'total_price' => '总价', 'total_price' => '总价',
'handling_fee' => '手续费', 'handling_fee' => '手续费',
'fob_transport_fee' => 'FOB运输费', 'fob_transport_fee' => 'FOB运输费',
'port_misc_fee' => '港杂', 'port_misc_fee' => '港杂',
'retrofit_fee' => '改装费', 'retrofit_fee' => '改装费',
'ocean_freight' => '海运费', 'ocean_freight' => '海运费',
'commission' => '佣金', 'commission' => '佣金',
'purchase_tax' => '购置税', 'purchase_tax' => '购置税',
'tax_refund' => '预估退税', 'tax_refund' => '预估退税',
'clearance_price' => '报关价', 'clearance_price' => '报关价',
'profit' => '利润'
]; ];
foreach ($priceFields as $field => $description) { foreach ($priceFields as $field => $description) {
@@ -813,7 +814,9 @@ class StockOrdersService
$modificationText = $this->getModificationText($v->options); $modificationText = $this->getModificationText($v->options);
// 计算单项利润 // 计算单项利润
$itemProfit = $this->calculateProfit($moneyValues, $v->mileage, $item); // $itemProfit = $this->calculateProfit($moneyValues, $v->mileage, $item);
// var_dump($moneyValues);
$itemProfit = empty($moneyValues['profit']['amount']) ? 0 : $moneyValues['profit']['amount'];
// 构建车辆信息 // 构建车辆信息
$vehList[$v->unique_id] = [ $vehList[$v->unique_id] = [