lambdaQuery()
+ .eq(Orders::getPlatform, StorePlatforms.GOOGLE)
+ .eq(Orders::getStoreTransactionId, storeTransactionId)
+ .last("limit 1"));
+ }
+
+ /** 把 Google 的原因码翻成可读的中文，写进订单的退款原因与流水。 */
+ private String reasonOf(GooglePlayPurchaseClient.VoidedPurchase item) {
+ String source = switch (item.voidedSource()) {
+ case 0 -> "用户退款";
+ case 1 -> "系统作废";
+ case 2 -> "开发者撤销";
+ default -> "商店作废";
+ };
+ LocalDateTime at = item.voidedTime();
+ return source + "（Google reason=" + item.voidedReason() + "，时间="
+ + (at == null ? "未知" : at.toString()) + "）";
+ }
+}
diff --git a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayPurchaseClient.java b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayPurchaseClient.java
index 526e3a1..28eef2b 100644
--- a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayPurchaseClient.java
+++ b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayPurchaseClient.java
@@ -3,6 +3,7 @@
package com.fruitshorts.commerce.service.store;
import java.time.LocalDateTime;
+import java.util.List;
/**
* Google Play Developer API 的取数端口。
@@ -19,6 +20,35 @@ public interface GooglePlayPurchaseClient {
*/
ProductPurchase fetchProductPurchase(String packageName, String productId, String purchaseToken);
+ /**
+ * 拉取"已作废（退款/撤销/拒付）"的交易，用于退款回收与对账。
+ *
+ * 对应 Google 的 `purchases.voidedpurchases.list`：一次性商品的作废是**整笔**，
+ * 拿不到部分金额，所以本层只表达"这笔作废了"。
+ *
+ * @param startMillis 起始时间（含），epoch 毫秒
+ * @param endMillis 结束时间（含），epoch 毫秒
+ */
+ List listVoidedPurchases(String packageName, long startMillis, long endMillis);
+
+ /**
+ * Google `purchases.voidedpurchases.list` 的单条记录。
+ *
+ * @param voidedSource 0=用户主动退款，1=系统/风控，2=开发者撤销
+ * @param voidedReason 具体原因码（Google 定义，原样保留便于排查）
+ */
+ record VoidedPurchase(String orderId, String purchaseToken, long voidedTimeMillis,
+ int voidedSource, int voidedReason, String purchaseType) {
+
+ /** 作废时间（本地时区）；时间戳为 0 时返回 null。 */
+ public LocalDateTime voidedTime() {
+ return voidedTimeMillis <= 0
+ ? null
+ : LocalDateTime.ofInstant(java.time.Instant.ofEpochMilli(voidedTimeMillis),
+ java.time.ZoneId.systemDefault());
+ }
+ }
+
/**
* Google `purchases.products.get` 的返回里我们需要的字段。
*
diff --git a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifier.java b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifier.java
index 28d3aa5..41f96ac 100644
--- a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifier.java
+++ b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifier.java
@@ -39,7 +39,10 @@ public class GooglePlayStoreVerifier implements StoreVerifier {
@Override
public StoreReceiptResult verify(String platform, String productId, String receipt) {
if (!StorePlatforms.isGoogle(platform)) {
- return StoreReceiptResult.failed("当前校验实现只支持 Google Play，收到的平台是：" + platform);
+ String hint = StorePlatforms.APPLE.equals(StorePlatforms.normalize(platform))
+ ? "Apple IAP 尚未实现（印尼 iOS 占比低，契约已预留端口，B2 再实现）"
+ : "当前校验实现只支持 Google Play，收到的平台是：" + platform;
+ return StoreReceiptResult.failed(hint);
}
String packageName = properties.getGooglePlayPackageName();
if (!StringUtils.hasText(packageName)) {
diff --git a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/HttpGooglePlayPurchaseClient.java b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/HttpGooglePlayPurchaseClient.java
index 41dd2d6..3dcfb74 100644
--- a/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/HttpGooglePlayPurchaseClient.java
+++ b/fruitshorts-module-commerce/src/main/java/com/fruitshorts/commerce/service/store/HttpGooglePlayPurchaseClient.java
@@ -27,7 +27,9 @@ import java.security.Signature;
import java.security.spec.PKCS8EncodedKeySpec;
import java.time.Duration;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.Base64;
+import java.util.List;
/**
* 用 JDK 自带 {@link HttpClient} 调 Google Play Developer API，**不引入 Google SDK 依赖**。
@@ -47,8 +49,12 @@ public class HttpGooglePlayPurchaseClient implements GooglePlayPurchaseClient {
private static final String TOKEN_ENDPOINT = "https://oauth2.googleapis.com/token";
private static final String PURCHASE_ENDPOINT =
"https://androidpublisher.googleapis.com/androidpublisher/v3/applications/%s/purchases/products/%s/tokens/%s";
+ private static final String VOIDED_ENDPOINT =
+ "https://androidpublisher.googleapis.com/androidpublisher/v3/applications/%s/purchases/voidedpurchases";
private static final String SCOPE = "https://www.googleapis.com/auth/androidpublisher";
private static final long TOKEN_SKEW_SECONDS = 60;
+ /** 单页最多 1000 条（Google 上限），超过就翻页，避免只对了一半还以为对完了。 */
+ private static final int VOIDED_PAGE_SIZE = 1000;
private final StoreProperties properties;
private final ObjectMapper objectMapper = new ObjectMapper();
@@ -64,6 +70,40 @@ public class HttpGooglePlayPurchaseClient implements GooglePlayPurchaseClient {
.build();
}
+ @Override
+ public List listVoidedPurchases(String packageName, long startMillis,
+ long endMillis) {
+ List result = new ArrayList<>();
+ String pageToken = "";
+ do {
+ StringBuilder url = new StringBuilder(String.format(VOIDED_ENDPOINT, encode(packageName)))
+ .append("?startTime=").append(startMillis)
+ .append("&endTime=").append(endMillis)
+ .append("&maxResults=").append(VOIDED_PAGE_SIZE);
+ if (StringUtils.hasText(pageToken)) {
+ url.append("&token=").append(encode(pageToken));
+ }
+ HttpRequest request = HttpRequest.newBuilder(URI.create(url.toString()))
+ .timeout(Duration.ofSeconds(properties.getGooglePlayTimeoutSeconds()))
+ .header("Authorization", "Bearer " + accessToken())
+ .header("Accept", "application/json")
+ .GET()
+ .build();
+ JsonNode body = send(request, "查询 Google Play 已作废交易失败");
+ for (JsonNode item : body.path("voidedPurchases")) {
+ result.add(new VoidedPurchase(
+ text(item, "orderId"),
+ text(item, "purchaseToken"),
+ item.path("voidedTimeMillis").asLong(0L),
+ item.path("voidedSource").asInt(-1),
+ item.path("voidedReason").asInt(-1),
+ text(item, "purchaseType")));
+ }
+ pageToken = body.path("tokenPagination").path("nextPageToken").asText("");
+ } while (StringUtils.hasText(pageToken));
+ return result;
+ }
+
@Override
public ProductPurchase fetchProductPurchase(String packageName, String productId,
String purchaseToken) {
diff --git a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceRefundTest.java b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceRefundTest.java
new file mode 100644
index 0000000..4629985
--- /dev/null
+++ b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceRefundTest.java
@@ -0,0 +1,133 @@
+// Author: fruit.com.cn
+
+package com.fruitshorts.commerce.service;
+
+import com.fruitshorts.commerce.dal.entity.OrderEvent;
+import com.fruitshorts.commerce.dal.entity.Orders;
+import com.fruitshorts.commerce.dal.mapper.OrderEventMapper;
+import com.fruitshorts.commerce.dal.mapper.OrdersMapper;
+import com.fruitshorts.commerce.dal.mapper.ProductMapper;
+import com.fruitshorts.commerce.dal.mapper.StoreReceiptMapper;
+import com.fruitshorts.common.exception.ErrorCode;
+import com.fruitshorts.common.exception.ServiceException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+/**
+ * 商店驱动的退款/拒付回收：回收一次、重复回调不二次回收，人工入口的既有契约不变。
+ */
+class OrderServiceRefundTest {
+
+ private static final String ORDER_NO = "FS202610161200000001";
+
+ private OrdersMapper ordersMapper;
+ private OrderEventMapper orderEventMapper;
+ private WalletService walletService;
+ private EntitlementService entitlementService;
+ private OrderService orderService;
+
+ @BeforeEach
+ void setUp() {
+ ordersMapper = mock(OrdersMapper.class);
+ orderEventMapper = mock(OrderEventMapper.class);
+ walletService = mock(WalletService.class);
+ entitlementService = mock(EntitlementService.class);
+ orderService = new OrderService(ordersMapper, orderEventMapper, mock(ProductMapper.class),
+ mock(StoreReceiptMapper.class), mock(StoreVerifier.class), walletService,
+ entitlementService);
+ given(entitlementService.revokeByOrderNo(anyString(), any())).willReturn(1);
+ }
+
+ @Test
+ void should_revoke_entitlement_and_claw_back_coins_when_store_reports_a_refund() {
+ given(ordersMapper.selectOne(any())).willReturn(deliveredOrder());
+
+ Orders order = orderService.refundByStoreCallback(ORDER_NO, "用户退款（Google reason=1）");
+
+ assertThat(order.getStatus()).isEqualTo(OrderService.STATUS_REFUNDED);
+ assertThat(order.getRefundAt()).isNotNull();
+ assertThat(order.getRefundReason()).contains("用户退款");
+ verify(entitlementService).revokeByOrderNo(eq(ORDER_NO), anyString());
+ verify(walletService).change(eq(1001L), eq(-550L), eq(WalletService.BIZ_REFUND),
+ eq(ORDER_NO), eq("order:" + ORDER_NO + ":refund"), anyString(), eq(false), isNull());
+ // 流水要写，而且来源标成 STORE，人工与商店回调在证据链上可区分
+ ArgumentCaptor event = ArgumentCaptor.forClass(OrderEvent.class);
+ verify(orderEventMapper).insert(event.capture());
+ assertThat(event.getValue().getEvent()).isEqualTo("REFUND");
+ assertThat(event.getValue().getSource()).isEqualTo("STORE");
+ assertThat(event.getValue().getPayload()).contains("回收权益 1 条");
+ }
+
+ @Test
+ void should_ignore_repeat_when_the_same_refund_callback_arrives_twice() {
+ Orders refunded = deliveredOrder();
+ refunded.setStatus(OrderService.STATUS_REFUNDED);
+ given(ordersMapper.selectOne(any())).willReturn(refunded);
+
+ Orders first = orderService.refundByStoreCallback(ORDER_NO, "用户退款");
+ Orders second = orderService.refundByStoreCallback(ORDER_NO, "用户退款");
+
+ assertThat(first.getStatus()).isEqualTo(OrderService.STATUS_REFUNDED);
+ assertThat(second.getStatus()).isEqualTo(OrderService.STATUS_REFUNDED);
+ // 幂等的关键：不二次回收权益、不二次扣币、不写第二条流水、不改订单
+ verify(entitlementService, never()).revokeByOrderNo(anyString(), any());
+ verify(walletService, never()).change(any(), anyLong(), anyString(), anyString(),
+ anyString(), anyString(), anyBoolean(), any());
+ verify(orderEventMapper, never()).insert(any(OrderEvent.class));
+ verify(ordersMapper, never()).updateById(any(Orders.class));
+ }
+
+ @Test
+ void should_keep_the_manual_refund_contract_when_order_is_already_refunded() {
+ Orders refunded = deliveredOrder();
+ refunded.setStatus(OrderService.STATUS_REFUNDED);
+ given(ordersMapper.selectOne(any())).willReturn(refunded);
+
+ // 人工入口保持原契约：已退款要报错（前端据此提示），不能被"幂等"改成静默
+ assertThatThrownBy(() -> orderService.refund(ORDER_NO, "重复操作", 1L))
+ .isInstanceOf(ServiceException.class)
+ .satisfies(ex -> assertThat(((ServiceException) ex).getCode())
+ .isEqualTo(ErrorCode.OPERATION_NOT_ALLOWED.getCode()))
+ .hasMessage("该订单已退款");
+ }
+
+ @Test
+ void should_do_nothing_when_a_voided_purchase_maps_to_an_unpaid_order() {
+ Orders created = deliveredOrder();
+ created.setStatus(OrderService.STATUS_CREATED);
+ created.setCoinAmount(0L);
+ given(ordersMapper.selectOne(any())).willReturn(created);
+
+ Orders order = orderService.refundByStoreCallback(ORDER_NO, "用户退款");
+
+ assertThat(order.getStatus()).isEqualTo(OrderService.STATUS_CREATED);
+ verify(entitlementService, never()).revokeByOrderNo(anyString(), any());
+ verify(orderEventMapper, never()).insert(any(OrderEvent.class));
+ }
+
+ private Orders deliveredOrder() {
+ Orders order = new Orders();
+ order.setId(1L);
+ order.setOrderNo(ORDER_NO);
+ order.setUserId(1001L);
+ order.setPlatform("GOOGLE");
+ order.setStoreTransactionId("GPA.3311-00001");
+ order.setCoinAmount(550L);
+ order.setStatus(OrderService.STATUS_DELIVERED);
+ return order;
+ }
+}
diff --git a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceVerifyTest.java b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceVerifyTest.java
index 88076c1..61dd368 100644
--- a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceVerifyTest.java
+++ b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/OrderServiceVerifyTest.java
@@ -179,6 +179,25 @@ class OrderServiceVerifyTest {
.hasMessageContaining("不支持的商店平台");
}
+ @Test
+ void should_keep_the_original_delivery_when_the_purchase_is_restored_on_another_device() {
+ // 恢复购买：换设备重新提交同一票据（purchaseToken 不变 → 同一个 Google orderId）
+ Orders delivered = deliveredOrder(USER);
+ delivered.setDeliveredAt(LocalDateTime.of(2026, 10, 15, 9, 30));
+ given(ordersMapper.selectOne(any())).willReturn(delivered);
+ verifier.result = okResult();
+
+ Orders restored = orderService.verifyAndDeliver(USER, "GOOGLE_PLAY", STORE_PRODUCT, TOKEN);
+
+ assertThat(restored.getOrderNo()).isEqualTo(delivered.getOrderNo());
+ assertThat(restored.getStatus()).isEqualTo(OrderService.STATUS_DELIVERED);
+ // 原有交付时间不被改写，说明没有二次发货
+ assertThat(restored.getDeliveredAt()).isEqualTo(LocalDateTime.of(2026, 10, 15, 9, 30));
+ verify(ordersMapper, never()).updateById(any(Orders.class));
+ verify(storeReceiptMapper, never()).insert(any(StoreReceipt.class));
+ verify(orderEventMapper, never()).insert(any(OrderEvent.class));
+ }
+
private AtomicReference captureInsertedOrder() {
AtomicReference saved = new AtomicReference<>();
given(ordersMapper.insert(any(Orders.class))).willAnswer(invocation -> {
diff --git a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/ReconcileServiceTest.java b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/ReconcileServiceTest.java
new file mode 100644
index 0000000..8e27200
--- /dev/null
+++ b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/ReconcileServiceTest.java
@@ -0,0 +1,145 @@
+// Author: fruit.com.cn
+
+package com.fruitshorts.commerce.service;
+
+import com.fruitshorts.commerce.dal.entity.Orders;
+import com.fruitshorts.commerce.dal.entity.ReconcileTask;
+import com.fruitshorts.commerce.dal.entity.StoreReceipt;
+import com.fruitshorts.commerce.dal.mapper.OrdersMapper;
+import com.fruitshorts.commerce.dal.mapper.ReconcileTaskMapper;
+import com.fruitshorts.commerce.dal.mapper.StoreReceiptMapper;
+import com.fruitshorts.common.exception.ServiceException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.ObjectProvider;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+
+/**
+ * 对账口径：集合比对差异 + **取不到的指标用 null 并在 notes 说明**（契约强制，不许用 0 冒充）。
+ */
+class ReconcileServiceTest {
+
+ private static final LocalDate DATE = LocalDate.of(2026, 10, 15);
+
+ private OrdersMapper ordersMapper;
+ private StoreReceiptMapper storeReceiptMapper;
+ private ReconcileTaskMapper reconcileTaskMapper;
+ private ObjectProvider provider;
+ private ReconcileService reconcileService;
+ private AtomicReference saved;
+
+ @BeforeEach
+ @SuppressWarnings("unchecked")
+ void setUp() {
+ ordersMapper = mock(OrdersMapper.class);
+ storeReceiptMapper = mock(StoreReceiptMapper.class);
+ reconcileTaskMapper = mock(ReconcileTaskMapper.class);
+ provider = mock(ObjectProvider.class);
+ reconcileService = new ReconcileService(reconcileTaskMapper, ordersMapper,
+ storeReceiptMapper, provider);
+ saved = new AtomicReference<>();
+ given(reconcileTaskMapper.insert(any(ReconcileTask.class))).willAnswer(invocation -> {
+ saved.set(invocation.getArgument(0));
+ return 1;
+ });
+ }
+
+ @Test
+ void should_return_null_store_amount_and_explain_the_missing_source_when_store_is_not_configured() {
+ given(provider.getIfAvailable()).willReturn(null);
+ given(ordersMapper.selectList(any())).willReturn(List.of(order("T1", "4.99")));
+ given(storeReceiptMapper.selectList(any())).willReturn(List.of(receipt("T1")));
+
+ ReconcileTask task = reconcileService.run(DATE, "ALL");
+
+ assertThat(task.getTotalCount()).isEqualTo(1);
+ assertThat(task.getMatchedCount()).isEqualTo(1);
+ assertThat(task.getDiffCount()).isZero();
+ assertThat(task.getAmountSum()).isEqualByComparingTo(new BigDecimal("4.99"));
+ assertThat(task.getStatus()).isEqualTo(ReconcileService.STATUS_SUCCESS);
+ // 契约强制：没有商店数据源 → null，不是 0
+ assertThat(task.getStoreAmountSum()).isNull();
+ assertThat(task.getNotes()).contains("数据源未配置");
+ assertThat(task.getNotes()).contains("财务报告");
+ }
+
+ @Test
+ void should_count_differences_on_both_sides_when_sets_do_not_line_up() {
+ given(provider.getIfAvailable()).willReturn(null);
+ given(ordersMapper.selectList(any())).willReturn(List.of(order("T1", "4.99")));
+ given(storeReceiptMapper.selectList(any())).willReturn(List.of(receipt("T2")));
+
+ ReconcileTask task = reconcileService.run(DATE, "ALL");
+
+ // 本地缺票据 1 笔 + 票据无本地订单 1 笔
+ assertThat(task.getDiffCount()).isEqualTo(2);
+ assertThat(task.getMatchedCount()).isZero();
+ assertThat(task.getNotes()).contains("本地缺票据 1 笔").contains("票据无本地订单 1 笔");
+ }
+
+ @Test
+ void should_recover_voided_purchases_and_report_them_in_notes_when_store_is_configured() {
+ StoreRefundService refundService = mock(StoreRefundService.class);
+ given(provider.getIfAvailable()).willReturn(refundService);
+ given(refundService.recoverVoidedPurchases("ALL", DATE))
+ .willReturn(new StoreRefundService.RecoverResult(1, 0, 1, 2));
+ given(ordersMapper.selectList(any())).willReturn(List.of(order("T1", "4.99")));
+ given(storeReceiptMapper.selectList(any())).willReturn(List.of(receipt("T1")));
+
+ ReconcileTask task = reconcileService.run(DATE, "ALL");
+
+ // 回收 1 笔；另有 1 笔商店说作废、本地无单 → 计入差异
+ assertThat(task.getDiffCount()).isEqualTo(1);
+ assertThat(task.getStoreAmountSum()).isNull();
+ assertThat(task.getNotes()).contains("已作废交易 2 笔").contains("回收 1 笔")
+ .contains("商店已作废但本地无单 1 笔");
+ }
+
+ @Test
+ void should_mark_task_failed_and_keep_notes_when_the_store_call_throws() {
+ StoreRefundService refundService = mock(StoreRefundService.class);
+ given(provider.getIfAvailable()).willReturn(refundService);
+ given(refundService.recoverVoidedPurchases("ALL", DATE))
+ .willThrow(new ServiceException("换取 Google access_token 失败"));
+ given(ordersMapper.selectList(any())).willReturn(List.of(order("T1", "4.99")));
+ given(storeReceiptMapper.selectList(any())).willReturn(List.of(receipt("T1")));
+
+ ReconcileTask task = reconcileService.run(DATE, "ALL");
+
+ // 调商店失败必须显性失败，不能写成 SUCCESS + 一堆 0
+ assertThat(task.getStatus()).isEqualTo(ReconcileService.STATUS_FAILED);
+ assertThat(task.getNotes()).contains("商店侧调用失败").contains("access_token");
+ assertThat(task.getStoreAmountSum()).isNull();
+ assertThat(task.getDiffCount()).isZero();
+ }
+
+ private Orders order(String transactionId, String amount) {
+ Orders order = new Orders();
+ order.setId(1L);
+ order.setOrderNo("FS202610151200000001");
+ order.setUserId(1001L);
+ order.setPlatform("GOOGLE");
+ order.setStoreTransactionId(transactionId);
+ order.setAmount(new BigDecimal(amount));
+ order.setStatus(OrderService.STATUS_DELIVERED);
+ return order;
+ }
+
+ private StoreReceipt receipt(String transactionId) {
+ StoreReceipt receipt = new StoreReceipt();
+ receipt.setId(1L);
+ receipt.setPlatform("GOOGLE");
+ receipt.setTransactionId(transactionId);
+ receipt.setOrderNo("FS202610151200000001");
+ return receipt;
+ }
+}
diff --git a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/StoreRefundServiceTest.java b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/StoreRefundServiceTest.java
new file mode 100644
index 0000000..28b2370
--- /dev/null
+++ b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/StoreRefundServiceTest.java
@@ -0,0 +1,142 @@
+// Author: fruit.com.cn
+
+package com.fruitshorts.commerce.service;
+
+import com.fruitshorts.commerce.config.StoreProperties;
+import com.fruitshorts.commerce.dal.entity.Orders;
+import com.fruitshorts.commerce.dal.mapper.OrdersMapper;
+import com.fruitshorts.commerce.service.store.GooglePlayPurchaseClient;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+/**
+ * 退款回收：拉商店作废列表 → 幂等回收本地订单；找不到本地单要计入差异；
+ * 未配置商店时**返回 null**（由对账写 notes），不能假装"回收了 0 笔"。
+ */
+class StoreRefundServiceTest {
+
+ private static final LocalDate DATE = LocalDate.of(2026, 10, 15);
+ private static final String PACKAGE_NAME = "com.stormg.fruitshorts";
+
+ private StoreProperties properties;
+ private StubPurchaseClient client;
+ private OrdersMapper ordersMapper;
+ private OrderService orderService;
+ private StoreRefundService refundService;
+
+ @BeforeEach
+ void setUp() {
+ properties = new StoreProperties();
+ properties.setGooglePlayPackageName(PACKAGE_NAME);
+ client = new StubPurchaseClient();
+ ordersMapper = mock(OrdersMapper.class);
+ orderService = mock(OrderService.class);
+ refundService = new StoreRefundService(properties, client, ordersMapper, orderService);
+ }
+
+ @Test
+ void should_recover_matched_order_and_report_unmatched_when_store_lists_voided_purchases() {
+ client.voided = List.of(
+ new GooglePlayPurchaseClient.VoidedPurchase("GPA.3311-00001", "token-1",
+ 1760000000000L, 0, 1, "0"),
+ new GooglePlayPurchaseClient.VoidedPurchase("GPA.3311-99999", "token-9",
+ 1760000000000L, 1, 2, "0"));
+ Orders matched = order("GPA.3311-00001");
+ given(ordersMapper.selectOne(any())).willReturn(matched, (Orders) null);
+ given(orderService.refundByStoreCallback(anyString(), anyString())).willAnswer(invocation -> {
+ matched.setStatus(OrderService.STATUS_REFUNDED);
+ return matched;
+ });
+
+ StoreRefundService.RecoverResult result = refundService.recoverVoidedPurchases("GOOGLE", DATE);
+
+ assertThat(result.voidedTotal()).isEqualTo(2);
+ assertThat(result.recovered()).isEqualTo(1);
+ assertThat(result.skipped()).isZero();
+ // 商店说有作废、本地没订单 → 必须计入差异，不能静默
+ assertThat(result.unmatched()).isEqualTo(1);
+ // 回收原因要带可读来源与 Google 原因码，方便客服解释
+ verify(orderService).refundByStoreCallback(eq(matched.getOrderNo()),
+ org.mockito.ArgumentMatchers.contains("用户退款"));
+ }
+
+ @Test
+ void should_count_skipped_when_the_order_was_already_refunded() {
+ client.voided = List.of(new GooglePlayPurchaseClient.VoidedPurchase("GPA.3311-00001",
+ "token-1", 1760000000000L, 0, 1, "0"));
+ Orders refunded = order("GPA.3311-00001");
+ refunded.setStatus(OrderService.STATUS_REFUNDED);
+ given(ordersMapper.selectOne(any())).willReturn(refunded);
+ // 已退款时 service 原样返回（状态不变）
+ given(orderService.refundByStoreCallback(anyString(), anyString())).willReturn(refunded);
+
+ StoreRefundService.RecoverResult result = refundService.recoverVoidedPurchases("GOOGLE", DATE);
+
+ assertThat(result.skipped()).isEqualTo(1);
+ assertThat(result.recovered()).isZero();
+ assertThat(result.unmatched()).isZero();
+ }
+
+ @Test
+ void should_return_null_when_google_play_is_not_configured() {
+ properties.setGooglePlayPackageName("");
+
+ StoreRefundService.RecoverResult result = refundService.recoverVoidedPurchases("GOOGLE", DATE);
+
+ assertThat(result).isNull();
+ // 没配凭据就不该发请求
+ assertThat(client.called).isFalse();
+ }
+
+ @Test
+ void should_return_null_when_platform_is_not_google() {
+ StoreRefundService.RecoverResult result = refundService.recoverVoidedPurchases("APPLE", DATE);
+
+ assertThat(result).isNull();
+ assertThat(client.called).isFalse();
+ verify(ordersMapper, never()).selectOne(any());
+ }
+
+ private Orders order(String transactionId) {
+ Orders order = new Orders();
+ order.setId(1L);
+ order.setOrderNo("FS202610151200000001");
+ order.setUserId(1001L);
+ order.setPlatform("GOOGLE");
+ order.setStoreTransactionId(transactionId);
+ order.setStatus(OrderService.STATUS_DELIVERED);
+ return order;
+ }
+
+ /** 替身商店客户端：只回预设的作废列表，并记录有没有被调用过。 */
+ private static final class StubPurchaseClient implements GooglePlayPurchaseClient {
+ private List voided = List.of();
+ private boolean called;
+
+ @Override
+ public List listVoidedPurchases(String packageName, long startMillis,
+ long endMillis) {
+ called = true;
+ return voided;
+ }
+
+ @Override
+ public ProductPurchase fetchProductPurchase(String packageName, String productId,
+ String purchaseToken) {
+ throw new UnsupportedOperationException("本测试不校验购买");
+ }
+ }
+}
diff --git a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifierTest.java b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifierTest.java
index 0bd32b3..2bb41e6 100644
--- a/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifierTest.java
+++ b/fruitshorts-module-commerce/src/test/java/com/fruitshorts/commerce/service/store/GooglePlayStoreVerifierTest.java
@@ -85,9 +85,18 @@ class GooglePlayStoreVerifierTest {
}
@Test
- void should_reject_when_platform_is_not_google() {
+ void should_reject_with_apple_hint_when_platform_is_apple() {
+ // Apple 只留端口：给客户端的提示要说清"尚未实现"，而不是含糊地报参数错
StoreVerifier.StoreReceiptResult result = verifier.verify("APPLE", PRODUCT_ID, TOKEN);
+ assertThat(result.ok()).isFalse();
+ assertThat(result.message()).contains("Apple IAP 尚未实现");
+ }
+
+ @Test
+ void should_reject_when_platform_is_unknown() {
+ StoreVerifier.StoreReceiptResult result = verifier.verify("NINTENDO", PRODUCT_ID, TOKEN);
+
assertThat(result.ok()).isFalse();
assertThat(result.message()).contains("只支持 Google Play");
}
@@ -111,5 +120,12 @@ class GooglePlayStoreVerifierTest {
requestedProductId = productId;
return purchase;
}
+
+ /** 本组测试只关心购买校验，作废列表用不到。 */
+ @Override
+ public java.util.List listVoidedPurchases(String packageName, long startMillis,
+ long endMillis) {
+ return java.util.List.of();
+ }
}
}
diff --git a/sql/schema-phase1.sql b/sql/schema-phase1.sql
index a03f5ca..fac5c1b 100644
--- a/sql/schema-phase1.sql
+++ b/sql/schema-phase1.sql
@@ -933,3 +933,14 @@ COMMENT ON COLUMN sys_admin_user.must_change_password IS '1 = 首登强制改密
-- 默认 1（超管照旧看到），置 0 表示"不给超管显示"。
ALTER TABLE sys_menu ADD COLUMN IF NOT EXISTS super_admin_visible SMALLINT NOT NULL DEFAULT 1;
COMMENT ON COLUMN sys_menu.super_admin_visible IS '0 = 不给超管显示（角色专属菜单用；超管的菜单是全量兜底，不走 sys_role_menu）';
+
+-- ============================================================
+-- 十、B1-2 对账：商店侧指标与说明
+-- ============================================================
+-- 对账要区分"本地口径"和"商店口径"，而商店的结算金额/手续费/税只能从 Play Console 财务报告取，
+-- Developer API 不提供。契约强制：**取不到的指标一律 null 并在 notes 说明缺什么，不许用 0 冒充**，
+-- 所以这两列必须可空（0 与 null 在对账语境里含义完全不同：0 是"确实是 0"，null 是"没有数据源"）。
+ALTER TABLE reconcile_task ADD COLUMN IF NOT EXISTS store_amount_sum NUMERIC(14,2);
+ALTER TABLE reconcile_task ADD COLUMN IF NOT EXISTS notes TEXT;
+COMMENT ON COLUMN reconcile_task.store_amount_sum IS '商店侧结算金额；无数据源时为 NULL（不要用 0 冒充）';
+COMMENT ON COLUMN reconcile_task.notes IS '对账说明：差异构成、缺哪些数据源、本次退款回收情况';