wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复税费计算逻辑

This commit is contained in:
Edward Yang 2022-08-19 16:19:19 +08:00
parent 6efe768138
commit a610c9231f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
beike/Admin/Repositories/RegionRepo.php
View File

@ -36,10 +36,10 @@ class RegionRepo
$newRegionZones = [];
foreach ($data['region_zones'] as $regionZone) {
if ($regionZone['country_id'] && $regionZone['zone_id']) {
if ($regionZone['country_id']) {
$newRegionZones[] = [
'country_id' => $regionZone['country_id'],
'zone_id' => $regionZone['zone_id'],
'country_id' => (int)$regionZone['country_id'],
'zone_id' => (int)$regionZone['zone_id'],
];
}
}

4
beike/Libraries/Tax.php
View File

@ -38,7 +38,7 @@ class Tax
} else {
$this->setShippingAddress($shippingAddress['country_id'], $shippingAddress['zone_id']);
}
} elseif (system_setting('base.config_tax_default') == 'shipping') {
} elseif (system_setting('base.tax_address') == 'shipping') {
$this->setShippingAddress($countryId, $zoneId);
}
@ -50,7 +50,7 @@ class Tax
} else {
$this->setPaymentAddress($paymentAddress['country_id'], $paymentAddress['zone_id']);
}
} elseif (system_setting('base.config_tax_default') == 'payment') {
} elseif (system_setting('base.tax_address') == 'payment') {
$this->setPaymentAddress($countryId, $zoneId);
}