suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #112 into master from cc_20260429_fix

Browse Source 
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
This commit is contained in:
正新
2026-04-29 05:39:17 +00:00
parent 22fcfc6a90
commit 0b98bd4bb6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
View File

@@ -137,7 +137,7 @@
<choose> <choose>
<!-- 情况1：regionIdList不为空，使用UNION优化 --> <!-- 情况1：regionIdList不为空，使用UNION优化 -->
<when test="regionIdList != null and regionIdList.size > 0"> <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 FROM store_${enterpriseId} a
WHERE a.is_delete = 'effective' and a.store_status != 'closed' WHERE a.is_delete = 'effective' and a.store_status != 'closed'
<if test="storeName!=null and storeName!=''"> <if test="storeName!=null and storeName!=''">
@@ -154,7 +154,7 @@
UNION 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 FROM store_${enterpriseId} a
INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id 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' WHERE a.is_delete = 'effective' and a.store_status != 'closed'
@@ -169,7 +169,7 @@
<!-- 情况2：regionIdList为空，直接查询关联表 --> <!-- 情况2：regionIdList为空，直接查询关联表 -->
<otherwise> <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 FROM store_${enterpriseId} a
INNER JOIN store_master_signer_info_${enterpriseId} b ON a.store_id = b.store_id 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' WHERE a.is_delete = 'effective' and a.store_status != 'closed'

4
coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java
View File

@@ -20,5 +20,9 @@ public class MiniShopsResponse {
private String ylsCode; private String ylsCode;
@ApiModelProperty("店铺详细地址") @ApiModelProperty("店铺详细地址")
private String detailAddress; private String detailAddress;
private String storeId; private String storeId;
@ApiModelProperty("标准店店型名称")
private String standardStoreTypeName;
} }