From bc2efbdb52190fe2e7be9920bbed6902d4ee28aa Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期五, 21 八月 2026 11:53:37 +0800
Subject: [PATCH] fix: centralize merchant type integration
---
talent-card-server/src/main/java/com/talentcard/server/mapper/TransportCarWashServiceMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/mapper/TransportCarWashServiceMapper.java b/talent-card-server/src/main/java/com/talentcard/server/mapper/TransportCarWashServiceMapper.java
index 16b74c5..3c33585 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/mapper/TransportCarWashServiceMapper.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/mapper/TransportCarWashServiceMapper.java
@@ -29,7 +29,7 @@
from merchant m
left join transport_car_wash_service s on s.merchant_id = m.id and s.deleted = 0
where m.deleted = 0
- and m.merchant_type = '自助洗车'
+ and m.merchant_type_code = 'carWash'
and (#{keyword} is null or #{keyword} = '' or m.merchant_name like concat('%', #{keyword}, '%')
or m.address like concat('%', #{keyword}, '%') or m.contact_mobile like concat('%', #{keyword}, '%'))
and (#{merchantId} is null or m.id = #{merchantId})
@@ -45,7 +45,7 @@
select count(*)
from merchant m
where m.deleted = 0
- and m.merchant_type = '自助洗车'
+ and m.merchant_type_code = 'carWash'
and (#{keyword} is null or #{keyword} = '' or m.merchant_name like concat('%', #{keyword}, '%')
or m.address like concat('%', #{keyword}, '%') or m.contact_mobile like concat('%', #{keyword}, '%'))
and (#{merchantId} is null or m.id = #{merchantId})
@@ -69,7 +69,7 @@
from merchant m
left join transport_car_wash_service s on s.merchant_id = m.id and s.deleted = 0
where m.deleted = 0
- and m.merchant_type = '自助洗车'
+ and m.merchant_type_code = 'carWash'
and m.id = #{merchantId}
limit 1
""")
@@ -90,7 +90,7 @@
from merchant m
left join transport_car_wash_service s on s.merchant_id = m.id and s.deleted = 0
where m.deleted = 0
- and m.merchant_type = '自助洗车'
+ and m.merchant_type_code = 'carWash'
and m.id = #{merchantId}
limit 1
""")
@@ -99,7 +99,7 @@
@Select("""
select count(*)
from merchant
- where deleted = 0 and merchant_type = '自助洗车' and id = #{merchantId}
+ where deleted = 0 and merchant_type_code = 'carWash' and id = #{merchantId}
""")
Long countCarWashMerchant(@Param("merchantId") Long merchantId);
-}
\ No newline at end of file
+}
--
Gitblit v1.7.1