|
|
@@ -546,17 +546,9 @@ class ItemClass extends BaseClass
|
|
|
$list[$k]['bigNum'] = $stockInfo['bigNum'];
|
|
|
$list[$k]['smallNum'] = $stockInfo['smallNum'];
|
|
|
$list[$k]['itemName'] = $v['name'] ?? '';
|
|
|
-
|
|
|
- $discountPrice = $v['discountPrice'] ?? 0;
|
|
|
- if ($discountPrice > 0) {
|
|
|
- $skMore = $v['skMore'] ?? 0;
|
|
|
- $addPrice = $v['addPrice'] ?? 0;
|
|
|
- $diff = bcsub($skMore, $addPrice, 2);
|
|
|
- if ($diff > 0) {
|
|
|
- $skPrice = bcadd($discountPrice, $diff, 2);
|
|
|
- } else {
|
|
|
- $skPrice = $discountPrice;
|
|
|
- }
|
|
|
+ $skDiscountPrice = $v['skDiscountPrice'] ?? 0;
|
|
|
+ if ($skDiscountPrice > 0) {
|
|
|
+ $skPrice = $skDiscountPrice;
|
|
|
} else {
|
|
|
$skPrice = $v['skPrice'] ?? 0;
|
|
|
}
|