From 342c91fb89af749fd50d59ea7ed2ee195e56e1c5 Mon Sep 17 00:00:00 2001
From: wangff <feifan.wang@hao168.com>
Date: Tue, 16 Sep 2025 10:50:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=89=A9=E8=81=94=E7=BD=91=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BC=80=E6=94=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/dao/StoreDao.java     |  4 +--
 .../com/cool/store/mapper/StoreMapper.java    |  2 +-
 .../src/main/resources/mapper/StoreMapper.xml |  8 +++++-
 .../java/com/cool/store/dto/StoreNameDTO.java | 25 +++++++++++++++++++
 .../java/com/cool/store/entity/StoreDO.java   |  5 +++-
 .../com/cool/store/service/StoreService.java  |  6 +++++
 .../store/service/impl/StoreServiceImpl.java  | 19 +++++++++++++-
 .../controller/webb/OpenApiController.java    |  7 ++++++
 8 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
index 086cd178b..2111657f4 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java
@@ -72,8 +72,8 @@ public class StoreDao {
     }
 
 
-    public List<StoreDO> list() {
-        return storeMapper.list();
+    public List<StoreDO> list(Integer isIot) {
+        return storeMapper.list(isIot);
     }
 
     public List<StoreDO> getStoreNumByStoreCodes(List<String> storeCodeIds) {
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
index 16b33d5ab..b4401bdf4 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
@@ -39,7 +39,7 @@ public interface StoreMapper {
      * 分页查询门店数据
      * @return
      */
-    List<StoreDO> list();
+    List<StoreDO> list(@Param("isIot") Integer isIot);
 
     List<StoreAreaDTO> getStoreAreaList( @Param("storeIds") List<String> storeIds);
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
index 506a50d72..3f87a8fa4 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
@@ -44,6 +44,7 @@
         <result column="join_brand" property="joinBrand" jdbcType="TINYINT"/>
         <result column="store_type" property="storeType" jdbcType="TINYINT"/>
         <result column="mini_program_order_store_name" property="miniProgramOrderStoreName"/>
+        <result column="is_iot" property="isIot" jdbcType="TINYINT"/>
     </resultMap>
 
     <select id="getByStoreId" resultMap="BaseResultMap">
@@ -129,7 +130,12 @@
 
     <select id="list" resultMap="BaseResultMap">
         select *
-        from store_${enterpriseId} where is_delete = 'effective' order by id asc
+        from store_${enterpriseId}
+        where is_delete = 'effective'
+        <if test="isIot != null">
+            AND is_iot = #{isIot}
+        </if>
+        order by id asc
     </select>
 
     <select id="getStoreAreaList" resultType="com.cool.store.dto.store.StoreAreaDTO">
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java
new file mode 100644
index 000000000..daf196280
--- /dev/null
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/StoreNameDTO.java
@@ -0,0 +1,25 @@
+package com.cool.store.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * 门店名称DTO
+ * </p>
+ *
+ * @author wangff
+ * @since 2025/9/16
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StoreNameDTO {
+    @ApiModelProperty("门店名称")
+    private String storeName;
+
+    @ApiModelProperty("门店编码")
+    private String storeNum;
+}
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
index 83572294e..9e415969f 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/StoreDO.java
@@ -238,5 +238,8 @@ public class StoreDO {
 
     private String miniProgramOrderStoreName;
 
-
+    /**
+     * 是否接入物联网
+     */
+    private Integer isIot;
 }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java
index d916b61a7..3397041b1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/StoreService.java
@@ -1,6 +1,7 @@
 package com.cool.store.service;
 
 import com.cool.store.dto.StoreDTO;
+import com.cool.store.dto.StoreNameDTO;
 import com.cool.store.dto.store.AuthStoreUserDTO;
 import com.cool.store.dto.store.StoreUserPositionDTO;
 import com.cool.store.response.MiniShopsResponse;
@@ -24,6 +25,11 @@ public interface StoreService {
      */
     PageInfo<StoreDTO> getStoreExtendFieldInfo(Integer pageSize,Integer pageNum);
 
+    /**
+     * 分页查询接入物联网的门店
+     */
+    PageInfo<StoreNameDTO> getIotStoreList(Integer pageNum, Integer pageSize);
+
     PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum);
 
     List<StoreUserPositionDTO> getStoreUser(List<String> storeCodeList);
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
index c2b36d9c6..fdea618db 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java
@@ -3,6 +3,7 @@ package com.cool.store.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.cool.store.dto.StoreNameDTO;
 import com.cool.store.dto.store.AuthStoreUserDTO;
 import com.cool.store.dao.EnterpriseUserDAO;
 import com.cool.store.dao.EnterpriseUserRoleDao;
@@ -77,7 +78,7 @@ public class StoreServiceImpl implements StoreService {
             throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE,"单次最多获取200条门店数据");
         }
         PageHelper.startPage(pageNum,pageSize);
-        List<StoreDO> list = storeDao.list();
+        List<StoreDO> list = storeDao.list(null);
         PageInfo info = new PageInfo<>(list);
         if (CollectionUtils.isEmpty(list)){
             return  info;
@@ -87,6 +88,22 @@ public class StoreServiceImpl implements StoreService {
         return info;
     }
 
+    @Override
+    public PageInfo<StoreNameDTO> getIotStoreList(Integer pageNum, Integer pageSize) {
+        if (pageSize > 200) {
+            throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "单次最多获取200条门店数据");
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<StoreDO> list = storeDao.list(1);
+        PageInfo info = new PageInfo<>(list);
+        if (CollectionUtils.isEmpty(list)){
+            return info;
+        }
+        List<StoreNameDTO> result = list.stream().map(v -> new StoreNameDTO(v.getStoreName(), v.getStoreNum())).collect(Collectors.toList());
+        info.setList(result);
+        return info;
+    }
+
     @Override
     public PageInfo<MiniShopsResponse> getStoreListByMobile(String mobile,Integer pageNum,Integer pageSize,String storeName,String storeNum) {
         //根据手机号查询 标品userId
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
index b5ce88f6b..5f67fa4e6 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java
@@ -68,6 +68,13 @@ public class OpenApiController {
     public ApiResponse<PageInfo<StoreDTO>> getStoreList(@RequestBody @Validated OpenApiStoreRequest dto) {
         return ApiResponse.success(storeService.getStoreExtendFieldInfo(dto.getPageSize(),dto.getPageNum()));
     }
+
+    @ApiOperation("获取接入物联网门店信息")
+    @PostMapping("/getIoTStoreList")
+    public ApiResponse<PageInfo<StoreNameDTO>> getIotStoreList(@RequestBody @Validated OpenApiStoreRequest dto) {
+        return ApiResponse.success(storeService.getIotStoreList(dto.getPageNum(), dto.getPageSize()));
+    }
+
     @ApiOperation("新管家回调 刷新收款单状态")
     @PostMapping("/changeReceiptStatus")
     public ApiResponse<Boolean> changeReceiptStatus(@RequestBody @Validated ReceiptCallBackRequest request){