|
@@ -64,10 +64,16 @@ class ItemController extends BaseController
|
|
|
util::stop('');
|
|
util::stop('');
|
|
|
}
|
|
}
|
|
|
if (isset($item->discountPrice) && $item->discountPrice > 0) {
|
|
if (isset($item->discountPrice) && $item->discountPrice > 0) {
|
|
|
- $price = $item->discountPrice;
|
|
|
|
|
- $skMore = $item->skMore;
|
|
|
|
|
- $skPrice = bcadd($price, $skMore, 2);
|
|
|
|
|
- $skPrice = floatval($skPrice);
|
|
|
|
|
|
|
+ $discountPrice = $item->discountPrice;
|
|
|
|
|
+ $skMore = $item->skMore ?? 0;
|
|
|
|
|
+ $addPrice = $item->addPrice ?? 0;
|
|
|
|
|
+ $diff = bcsub($skMore, $addPrice, 2);
|
|
|
|
|
+ if ($diff > 0) {
|
|
|
|
|
+ $skPrice = bcadd($discountPrice, $diff, 2);
|
|
|
|
|
+ $skPrice = floatval($skPrice);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ $skPrice = floatval($discountPrice);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
$skPrice = $item->skPrice ?? 0;
|
|
$skPrice = $item->skPrice ?? 0;
|
|
|
$skPrice = floatval($skPrice);
|
|
$skPrice = floatval($skPrice);
|