From b36f4c2800e88f8c5060ae926d3eb25d4bcb69c0 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期五, 11 九月 2026 11:06:36 +0800
Subject: [PATCH] 又又更新
---
talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
index a6295cc..532b09a 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
@@ -226,9 +226,11 @@
int size
) {
StringBuilder sql = new StringBuilder("""
- select m.id, m.merchant_name, m.merchant_type, m.contact_name, m.contact_mobile,
+ select m.id, m.merchant_name, m.merchant_type, m.merchant_type_code, m.contact_name, m.contact_mobile,
m.logo_url, m.cover_url, m.address, m.is_recommend, m.sort_no, m.status,
- m.created_at,
+ m.created_at, m.merchant_rights_config,
+ (select s.external_link_type from transport_car_wash_service s
+ where s.merchant_id = m.id and s.deleted = 0 order by s.id desc limit 1) as car_wash_external_link_type,
(select count(*) from merchant_product p where p.merchant_id = m.id and p.deleted = 0) as product_count,
(select count(*) from benefit_order o where o.merchant_id = m.id and o.deleted = 0) as order_count,
0 as reservation_count
--
Gitblit v1.7.1