youpaishidifu/Sdf1_login
1
1
Fork 0
Code Issues 15 Pull Requests Actions 1 Packages Projects Releases 13 Wiki Activity

修复: packmoney和green_discount全面支持小数(int→double，去掉Math.floor截断)，PHP侧packmoney强转int改为float

Browse Source
This commit is contained in:
youpaishidifu
2026-07-07 23:54:20 +08:00
parent 6bf3fceed6
commit e18587c432
4 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/Sdf1_login/ConfigManager.java
+2 -2
View File
@@ -60,8 +60,8 @@ public class ConfigManager {
public int tpSendIntervalSeconds = 10; // 发送间隔（秒）
// ===== 商店打包配置（来自 PHP shop_config，定时拉取）=====
public int packingFee = 5; // 彩色潜影盒打包加收债券数（原色免费）
public int greenDiscount = 2; // 环保单减免百分比（不打包/塞背包时减免，0=不减免）
public double packingFee = 5.0; // 彩色潜影盒打包加收债券数（原色免费，支持小数）
public double greenDiscount = 2.0; // 环保单减免百分比（不打包/塞背包时减免，0=不减免，支持小数）
// ★ 构造函数接收 File，和 Main.java 调用一致 ★
public ConfigManager(File dataFolder) {
src/main/java/Sdf1_login/Main.java
+3 -3
View File
@@ -4656,9 +4656,9 @@ public class Main extends JavaPlugin
return true;
}
try {
int amt = Integer.parseInt(args[2]);
if (amt < 0 || amt > 999) {
sender.sendMessage("§c打包费需在 0~999 之间");
double amt = Double.parseDouble(args[2]);
if (amt < 0 || amt > 9999) {
sender.sendMessage("§c打包费需在 0~9999 之间");
return true;
}
getConfigMgr().packingFee = amt;
src/main/java/Sdf1_login/ShopManager.java
+28 -30
View File
@@ -452,8 +452,8 @@ public class ShopManager implements Listener {
private boolean deductAndGive(Player p,
List<CartItem> cart, int baseTotal,
boolean useShulker, Material color,
String packNote, int packFee,
int ecoPct, int couponPct) {
String packNote, double packFee,
double ecoPct, int couponPct) {
UUID uuid = p.getUniqueId();
int originalTotal = 0;
@@ -491,7 +491,7 @@ public class ShopManager implements Listener {
if (packFee > 0) {
plugin.getBonds().deductBonds(
p.getName(), packFee,
p.getName(), (int) Math.round(packFee),
"shop_packing", "",
"商店系统", "打包费");
}
@@ -538,9 +538,9 @@ public class ShopManager implements Listener {
}
plugin.getOrderManager().recordOrder(
p, orderItems, originalTotal,
baseTotal + packFee,
(int) (baseTotal + Math.round(packFee)),
originalTotal - baseTotal,
dType, cCode, packFee,
dType, cCode, (int) Math.round(packFee),
useShulker ? (packFee > 0
? "custom" : "default")
: "none",
@@ -776,12 +776,12 @@ public class ShopManager implements Listener {
int couponPct = activeDiscount
.getOrDefault(p.getUniqueId(), 0);
int ecoPct = 0;
int packFeeCfg = plugin.getConfigMgr().packingFee; // 彩色潜影盒打包费（配置）
int greenPct = plugin.getConfigMgr().greenDiscount; // 环保单减免（不打包时减免）
double ecoPct = 0;
double packFeeCfg = plugin.getConfigMgr().packingFee; // 彩色潜影盒打包费（配置）
double greenPct = plugin.getConfigMgr().greenDiscount; // 环保单减免（不打包时减免）
if (raw == 10) {
ecoPct = greenPct; // 不打包（环保单）→ 减免
if (raw == 10) { // 不打包（环保单）→ 减免
ecoPct = greenPct;
}
double factor = 1.0;
@@ -840,7 +840,7 @@ public class ShopManager implements Listener {
"灰色","淡灰","青色","紫色",
"蓝色","棕色","绿色","红色","黑色"
};
int packFee = plugin.getConfigMgr().packingFee; // 打包费（彩色潜影盒加收，来自配置）
double packFee = plugin.getConfigMgr().packingFee; // 打包费（彩色潜影盒加收，来自配置）
for (int i = 0; i < SHULKER_COLORS.length; i++) {
ItemStack is = new ItemStack(SHULKER_COLORS[i]);
ItemMeta im = is.getItemMeta();
@@ -2272,16 +2272,16 @@ public class ShopManager implements Listener {
return true;
}
// 打包费配置：shop packmoney <金额> （与 /sdf1_login set packmoney 等效）
// 打包费配置：shop packmoney <金额> （与 /sdf1_login set packmoney 等效，支持小数）
if (sub.equals("packmoney")) {
if (a.length < 3) {
s.sendMessage("§e用法: shop packmoney <金额(0~999)>");
s.sendMessage("§e用法: shop packmoney <金额(0~9999，支持小数)>");
return true;
}
try {
int amt = Integer.parseInt(a[2]);
if (amt < 0 || amt > 999) {
s.sendMessage("§c打包费需在 0~999 之间");
double amt = Double.parseDouble(a[2]);
if (amt < 0 || amt > 9999) {
s.sendMessage("§c打包费需在 0~9999 之间");
return true;
}
plugin.getConfigMgr().packingFee = amt;
@@ -2293,20 +2293,19 @@ public class ShopManager implements Listener {
return true;
}
// 环保单减免：shop green <1-10> （与 shop setgreen 等效，便于在 shop 子命令下管理）
// 环保单减免：shop green <1-10> （与 shop setgreen 等效，便于在 shop 子命令下管理，支持小数）
if (sub.equals("green")) {
if (a.length < 3) {
s.sendMessage("§e用法: shop green <1-10>（10=不减免，1-9.99=按比例减免%）");
s.sendMessage("§e用法: shop green <0~10>（10=不减免，支持小数如 9.6 / 3.33）");
return true;
}
try {
double v = Double.parseDouble(a[2]);
int gv = (int) Math.floor(v);
if (gv < 0) gv = 0;
if (gv >= 10) gv = 0; // 10 视为不减免
plugin.getConfigMgr().greenDiscount = gv;
plugin.webManager.pushShopConfig("green_discount", String.valueOf(gv));
s.sendMessage("§a环保单减免已设置为 " + gv + "%（10=不减免，已同步至Web配置）");
if (v < 0) v = 0;
if (v >= 10) v = 0; // 10 视为不减免
plugin.getConfigMgr().greenDiscount = v;
plugin.webManager.pushShopConfig("green_discount", String.valueOf(v));
s.sendMessage("§a环保单减免已设置为 " + v + "%（10=不减免，已同步至Web配置）");
} catch (NumberFormatException e) {
s.sendMessage("§c参数必须为数字");
}
@@ -2323,12 +2322,11 @@ public class ShopManager implements Listener {
}
try {
double v = Double.parseDouble(a[2]);
int gv = (int) Math.floor(v);
if (gv < 0) gv = 0;
if (gv >= 10) gv = 0; // 10 视为不减免
plugin.getConfigMgr().greenDiscount = gv;
plugin.webManager.pushShopConfig("green_discount", String.valueOf(gv));
s.sendMessage("§a环保单减免已设置为 " + gv
if (v < 0) v = 0;
if (v >= 10) v = 0; // 10 视为不减免
plugin.getConfigMgr().greenDiscount = v;
plugin.webManager.pushShopConfig("green_discount", String.valueOf(v));
s.sendMessage("§a环保单减免已设置为 " + v
+ "%（10=不减免，已同步至Web配置）");
} catch (NumberFormatException e) {
s.sendMessage("§c参数必须为数字");
src/main/java/Sdf1_login/WebManager.java
+2 -2
View File
@@ -6497,10 +6497,10 @@ public class WebManager {
if (objEnd < 0) return;
Map<String, Object> m = parseJsonObject(sub.substring(objStart, objEnd + 1));
if (m.containsKey("packmoney")) {
plugin.getConfigMgr().packingFee = ((Number) m.get("packmoney")).intValue();
plugin.getConfigMgr().packingFee = ((Number) m.get("packmoney")).doubleValue();
}
if (m.containsKey("green_discount")) {
plugin.getConfigMgr().greenDiscount = ((Number) m.get("green_discount")).intValue();
plugin.getConfigMgr().greenDiscount = ((Number) m.get("green_discount")).doubleValue();
}
} catch (Exception e) {
plugin.getLogger().warning("[配置同步] 拉取商店打包配置异常: " + e.getMessage());