From cb5a42c97fe9ae23b891bdc3231dc8eb100de218 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期一, 31 八月 2026 16:49:41 +0800
Subject: [PATCH] fix: route hotel free voucher scans to dedicated verification page
---
talent-card-server/src/main/java/com/talentcard/server/service/MerchantSettlementStatisticsService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/service/MerchantSettlementStatisticsService.java b/talent-card-server/src/main/java/com/talentcard/server/service/MerchantSettlementStatisticsService.java
index 59782e9..0dc4d4e 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/service/MerchantSettlementStatisticsService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/service/MerchantSettlementStatisticsService.java
@@ -130,7 +130,7 @@
result.put("subsidyAmountCents", subsidyAmount);
result.put("subsidyAmount", yuan(subsidyAmount));
result.put("hasData", transactionAmount > 0 || todayVerificationCount > 0 || weekVerificationCount > 0 || subsidyAmount > 0);
- result.put("statisticsBasis", "交易总额统计已支付订单实付金额；补贴总额仅统计政府承担补贴的商品补贴和政府补贴券金额，商家自行让利不进入政府补贴结算");
+ result.put("statisticsBasis", "交易总额统计已支付订单实付金额；补贴总额统计政府承担的订单补贴、政府补贴券及酒店免费入住线下补贴，商家自行让利不进入政府补贴结算");
return result;
}
@@ -278,7 +278,7 @@
result.put("governmentSubsidyOrderCount", longValue(row, "governmentSubsidyOrderCount"));
result.put("periodStartTime", value(row, "periodStartTime", "startTime"));
result.put("periodEndTime", value(row, "periodEndTime", "endTime"));
- result.put("statisticsBasis", "已支付且已核销订单；补贴额仅统计政府承担补贴的商品补贴和政府补贴券金额，商家自行让利不进入政府补贴结算");
+ result.put("statisticsBasis", "已支付且已核销订单及酒店免费入住核销记录；补贴额统计政府承担的订单补贴、政府补贴券及酒店免费入住线下补贴，商家自行让利不进入政府补贴结算");
return result;
}
@@ -422,6 +422,7 @@
case "STORE_CONSUME" -> "到店消费";
case "GROUP_BUY" -> "团购订单";
case "HOTEL_RESERVATION" -> "酒店预约";
+ case "HOTEL_FREE" -> "酒店免费入住";
default -> clean(orderType);
};
}
--
Gitblit v1.7.1