From c2f0ec3b3891bc177bdc58c2a111ab9c4fea911d Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期五, 18 九月 2026 17:13:38 +0800
Subject: [PATCH] 更新....
---
talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java b/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java
index 2e6d6be..10258c2 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java
@@ -102,6 +102,7 @@
o.benefit_id, b.benefit_name,
o.merchant_id, m.merchant_name, m.merchant_rights_config,
o.product_id, o.product_name_snapshot, p.rights_config,
+ p.cover_url as product_cover_url, m.cover_url as merchant_cover_url,
o.order_type, o.order_amount, o.base_pay_amount, o.coupon_amount,
o.subsidy_amount, o.pay_amount, o.order_status, o.verify_status, o.refund_status, o.created_at,
vr.verify_time, vr.status as verify_record_status
@@ -118,6 +119,7 @@
List<Map<String, Object>> freeStayRows = query("""
select r.id, r.verify_no as order_no, r.talent_id, tu.name as talent_name, tu.mobile as talent_mobile, tu.gender,
r.card_id, tc.card_no, tc.card_level, r.merchant_id, m.merchant_name, m.merchant_rights_config,
+ m.cover_url as merchant_cover_url,
'免费入住' as benefit_name, '1天免费入住' as product_name_snapshot,
'FREE_STAY' as order_type, 0 as order_amount, 0 as base_pay_amount, 0 as coupon_amount,
r.subsidy_amount, 0 as pay_amount, 1 as order_status, 1 as verify_status, 0 as refund_status,
--
Gitblit v1.7.1