From 0b98bd4bb62b86ac808e412a9b149dedc9a7296d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E6=96=B0?=
 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Date: Wed, 29 Apr 2026 05:39:17 +0000
Subject: [PATCH] Merge #112 into master from cc_20260429_fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat：门店列表新增标准店店型名称

* cc_20260429_fix: (1 commits squashed)

  - feat：门店列表新增标准店店型名称

Signed-off-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/112
---
 .../src/main/resources/mapper/StoreMapper.xml               | 6 +++---
 .../java/com/cool/store/response/MiniShopsResponse.java     | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index ed31da732..74718ae15 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -137,7 +137,7 @@
         <choose>
             <!-- 情况1：regionIdList不为空，使用UNION优化 -->
             <when test="regionIdList != null and regionIdList.size > 0">
-                SELECT store_id as storeId, store_name as shopName, store_num as shopCode, store_address as detailAddress
+                SELECT store_id as storeId, store_name as shopName, store_num as shopCode, store_address as detailAddress, standard_store_type_name as  standardStoreTypeName
                 FROM store_${enterpriseId} a
                 WHERE a.is_delete = 'effective' and a.store_status != 'closed'
                 <if test="storeName!=null and storeName!=''">
@@ -154,7 +154,7 @@
 
                 UNION
 
-                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress
+                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress,standard_store_type_name as  standardStoreTypeName
                 FROM store_${enterpriseId} a
                 INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id
                 WHERE a.is_delete = 'effective' and a.store_status != 'closed'
@@ -169,7 +169,7 @@
 
             <!-- 情况2：regionIdList为空，直接查询关联表 -->
             <otherwise>
-                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress
+                SELECT a.store_id as storeId, a.store_name as shopName, a.store_num as shopCode, a.store_address as detailAddress,standard_store_type_name as  standardStoreTypeName
                 FROM store_${enterpriseId} a
                 INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id
                 WHERE a.is_delete = 'effective' and a.store_status != 'closed'
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java
index 60c8989f3..ffa795413 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java
@@ -20,5 +20,9 @@ public class MiniShopsResponse {
     private String ylsCode;
     @ApiModelProperty("店铺详细地址")
     private String detailAddress;
+
     private String storeId;
+
+    @ApiModelProperty("标准店店型名称")
+    private String standardStoreTypeName;
 }