From 52727dfd7cc5526b6b94e0636291a7bf8bdabdf5 Mon Sep 17 00:00:00 2001 From: ziin Date: Thu, 9 Apr 2026 14:04:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=BA=A7=E5=93=81ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 ApplePurchaseServiceImpl、GooglePlayEntitlementApplier 与 GooglePlayWalletBenefitService 中记录的 productId 改为 productName，保持日志与业务语义一致。 --- .../keyborad/googleplay/GooglePlayEntitlementApplier.java | 2 +- .../keyborad/googleplay/GooglePlayWalletBenefitService.java | 4 ++-- .../yolo/keyborad/service/impl/ApplePurchaseServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/yolo/keyborad/googleplay/GooglePlayEntitlementApplier.java b/src/main/java/com/yolo/keyborad/googleplay/GooglePlayEntitlementApplier.java index fb727b6..b7662aa 100644 --- a/src/main/java/com/yolo/keyborad/googleplay/GooglePlayEntitlementApplier.java +++ b/src/main/java/com/yolo/keyborad/googleplay/GooglePlayEntitlementApplier.java @@ -177,7 +177,7 @@ public class GooglePlayEntitlementApplier { entitlement.setActive(true); return; } - walletBenefitService.grant(userId, order.getId(), product.getProductId(), amount); + walletBenefitService.grant(userId, order.getId(), product.getName(), amount); entitlement.setActive(true); entitlement.setQuantity(amount); entitlement.setStartTime(new Date()); diff --git a/src/main/java/com/yolo/keyborad/googleplay/GooglePlayWalletBenefitService.java b/src/main/java/com/yolo/keyborad/googleplay/GooglePlayWalletBenefitService.java index bd5d8f1..c4f929b 100644 --- a/src/main/java/com/yolo/keyborad/googleplay/GooglePlayWalletBenefitService.java +++ b/src/main/java/com/yolo/keyborad/googleplay/GooglePlayWalletBenefitService.java @@ -20,7 +20,7 @@ public class GooglePlayWalletBenefitService { private final KeyboardUserWalletService walletService; private final KeyboardWalletTransactionService walletTransactionService; - public void grant(Long userId, Long orderId, String productId, BigDecimal amount) { + public void grant(Long userId, Long orderId, String productName, BigDecimal amount) { KeyboardUserWallet wallet = getOrCreateWallet(userId); BigDecimal before = defaultBalance(wallet.getBalance()); BigDecimal after = before.add(amount); @@ -28,7 +28,7 @@ public class GooglePlayWalletBenefitService { wallet.setUpdatedAt(new Date()); walletService.saveOrUpdate(wallet); walletTransactionService.createTransaction(userId, orderId, amount, GOOGLE_PLAY_WALLET_TX_TYPE, - before, after, productId); + before, after, productName); } public boolean revoke(Long userId, Long orderId, BigDecimal amount) { diff --git a/src/main/java/com/yolo/keyborad/service/impl/ApplePurchaseServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/ApplePurchaseServiceImpl.java index 7d4b51f..8ff309c 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/ApplePurchaseServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/ApplePurchaseServiceImpl.java @@ -783,7 +783,7 @@ public class ApplePurchaseServiceImpl implements ApplePurchaseService { (short) 2, // 交易类型：2-苹果内购充值 before, after, - product.getProductId() + product.getName() ); // 8. 记录充值成功日志