修复: PHP端packmoney从(int)强转改为(float)支持小数(cashier/shop/sync三处)
This commit is contained in:
+2
-2
@@ -293,7 +293,7 @@ function cartConfig() {
|
|||||||
success([
|
success([
|
||||||
'backpack_rate' => (float)($cfg['cart_backpack_rate'] ?? '0.98'),
|
'backpack_rate' => (float)($cfg['cart_backpack_rate'] ?? '0.98'),
|
||||||
'shulker_rate' => (float)($cfg['cart_shulker_rate'] ?? '1.00'),
|
'shulker_rate' => (float)($cfg['cart_shulker_rate'] ?? '1.00'),
|
||||||
'packmoney' => (int)($cfg['packmoney'] ?? '5'),
|
'packmoney' => (float)($cfg['packmoney'] ?? '5'),
|
||||||
'green_discount' => (float)($cfg['green_discount'] ?? '2')
|
'green_discount' => (float)($cfg['green_discount'] ?? '2')
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
@@ -378,7 +378,7 @@ function shopBuyCart($token) {
|
|||||||
$rate = (float)($cfg['cart_shulker_rate'] ?? '1.00');
|
$rate = (float)($cfg['cart_shulker_rate'] ?? '1.00');
|
||||||
$modeName = '潜影盒打包';
|
$modeName = '潜影盒打包';
|
||||||
// 潜影盒颜色额外收费(原色/紫色免费,其它加收打包费,打包费来自配置 packmoney)
|
// 潜影盒颜色额外收费(原色/紫色免费,其它加收打包费,打包费来自配置 packmoney)
|
||||||
$packMoney = (int)($cfg['packmoney'] ?? '5');
|
$packMoney = (float)($cfg['packmoney'] ?? '5');
|
||||||
$colorFee = ($shulkerColor !== 'default' && $shulkerColor !== 'purple') ? $packMoney : 0;
|
$colorFee = ($shulkerColor !== 'default' && $shulkerColor !== 'purple') ? $packMoney : 0;
|
||||||
// 颜色名称映射
|
// 颜色名称映射
|
||||||
$colorNames = ['default'=>'原色','purple'=>'原色','white'=>'白色','black'=>'黑色','red'=>'红色','blue'=>'蓝色','green'=>'绿色','yellow'=>'黄色','orange'=>'橙色'];
|
$colorNames = ['default'=>'原色','purple'=>'原色','white'=>'白色','black'=>'黑色','red'=>'红色','blue'=>'蓝色','green'=>'绿色','yellow'=>'黄色','orange'=>'橙色'];
|
||||||
|
|||||||
+1
-1
@@ -2818,7 +2818,7 @@ function getShopConfigSync() {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
success([
|
success([
|
||||||
'packmoney' => (int)$read('packmoney', '5'),
|
'packmoney' => (float)$read('packmoney', '5'),
|
||||||
'green_discount' => (float)$read('green_discount', '2')
|
'green_discount' => (float)$read('green_discount', '2')
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ function cashierGetConfig() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$cfg = cashierGetConfig();
|
$cfg = cashierGetConfig();
|
||||||
$packMoney = (int)$cfg['packmoney'];
|
$packMoney = (float)$cfg['packmoney'];
|
||||||
$greenDiscount = (float)$cfg['green_discount'];
|
$greenDiscount = (float)$cfg['green_discount'];
|
||||||
$backpackRate = (float)($cfg['cart_backpack_rate'] ?? 0.98);
|
$backpackRate = (float)($cfg['cart_backpack_rate'] ?? 0.98);
|
||||||
$shulkerRate = (float)($cfg['cart_shulker_rate'] ?? 1.00);
|
$shulkerRate = (float)($cfg['cart_shulker_rate'] ?? 1.00);
|
||||||
|
|||||||
Reference in New Issue
Block a user