From 33b970a0336e77e7e25590259c4e95a7e1fbce8e Mon Sep 17 00:00:00 2001 From: hy001 Date: Fri, 8 May 2026 13:56:34 +0800 Subject: [PATCH] fix(order): scan Google refunds for Yumi package --- .../app/scheduler/GoogleReimburseCheckTask.java | 16 +++++++++------- .../entity/order/OrderGoogleVoidedPurchase.java | 6 +++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/scheduler/GoogleReimburseCheckTask.java b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/scheduler/GoogleReimburseCheckTask.java index 53171028..af85696e 100644 --- a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/scheduler/GoogleReimburseCheckTask.java +++ b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/scheduler/GoogleReimburseCheckTask.java @@ -5,7 +5,6 @@ import com.google.api.services.androidpublisher.model.VoidedPurchasesListRespons import com.red.circle.common.business.core.enums.SysOriginPlatformEnum; import com.red.circle.component.pay.google.GoogleVerifyService; import com.red.circle.component.redis.annotation.TaskCacheLock; -import com.red.circle.component.redis.service.RedisService; import com.red.circle.framework.web.props.EnvProperties; import com.red.circle.order.app.common.RecycleReimburseOrderProductCommon; import com.red.circle.order.domain.tuple.KeyValuePair; @@ -21,7 +20,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.sql.Timestamp; -import java.util.Arrays; import java.util.List; import java.util.Objects; @@ -35,6 +33,10 @@ import java.util.Objects; @AllArgsConstructor public class GoogleReimburseCheckTask { + private static final String LIKEI_ANDROID_PACKAGE_NAME = "com.org.yumiparty"; + private static final int GOOGLE_REIMBURSE_SCAN_DAYS = 7; + private static final int GOOGLE_REIMBURSE_SCAN_MINUTES = GOOGLE_REIMBURSE_SCAN_DAYS * 24 * 60; + private final OrderCacheService orderCacheService; private final EnvProperties envProperties; private final GoogleVerifyService googleVerifyService; @@ -52,14 +54,14 @@ public class GoogleReimburseCheckTask { return; } - executeReimburse(20); - log.warn("exec google_reimburse_check_job end with {}",System.currentTimeMillis()-startTime); + executeReimburse(GOOGLE_REIMBURSE_SCAN_MINUTES); + log.warn("exec google_reimburse_check_job end with {}", System.currentTimeMillis() - startTime); } public void executeReimburse(int latestMinutes) { - List.of( - KeyValuePair.of(SysOriginPlatformEnum.LIKEI, "com.tkm.likei") - ).forEach(keyValuePair -> { + List.of( + KeyValuePair.of(SysOriginPlatformEnum.LIKEI, LIKEI_ANDROID_PACKAGE_NAME) + ).forEach(keyValuePair -> { VoidedPurchasesListResponse response = googleVerifyService .getVoidedPurchases(keyValuePair.getKey(), keyValuePair.getValue(), diff --git a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/rds/entity/order/OrderGoogleVoidedPurchase.java b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/rds/entity/order/OrderGoogleVoidedPurchase.java index 332bdfa9..ec9ea3be 100644 --- a/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/rds/entity/order/OrderGoogleVoidedPurchase.java +++ b/rc-service/rc-service-order/order-infrastructure/src/main/java/com/red/circle/order/infra/database/rds/entity/order/OrderGoogleVoidedPurchase.java @@ -82,13 +82,13 @@ public class OrderGoogleVoidedPurchase extends TimestampBaseEntity { private String description; public String getVoidedSourceString() { - if (Objects.equals(voidedReason, 0)) { + if (Objects.equals(voidedSource, 0)) { return "用户"; } - if (Objects.equals(voidedReason, 1)) { + if (Objects.equals(voidedSource, 1)) { return "开发者"; } - if (Objects.equals(voidedReason, 2)) { + if (Objects.equals(voidedSource, 2)) { return "Google"; } return "未知";