From b84f941c1f5ef07ca351e299675b8b7fac7ee560 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 16:49:39 +0800
Subject: [PATCH] fix desk

---
 .../main/java/com/cool/store/dao/ShopStageInfoDAO.java    | 4 ++--
 .../java/com/cool/store/mapper/ShopStageInfoMapper.java   | 2 +-
 .../src/main/resources/mapper/ShopStageInfoMapper.xml     | 4 ++--
 .../java/com/cool/store/service/impl/DeskServiceImpl.java | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
index b22af2485..5c3d13d57 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java
@@ -290,11 +290,11 @@ public class ShopStageInfoDAO {
         }
         return shopStageInfoMapper.getSubStageList(shopIds,shopSubStage);
     }
-    public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStageStatus){
+    public List<ShopStageInfoDO> getSubStages(List<Long> shopIds, Integer shopSubStage){
         if(CollectionUtils.isEmpty(shopIds) ){
             return Collections.emptyList();
         }
-        return shopStageInfoMapper.getSubStages(shopIds,shopSubStageStatus);
+        return shopStageInfoMapper.getSubStages(shopIds,shopSubStage);
     }
 
     /**
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
index f80aa4e39..07d7908ed 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java
@@ -134,7 +134,7 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
                                                   @Param("shopSubStageStatusList") List<Integer> shopSubStageStatusList,
                                                   @Param("investmentUserId") String investmentUserId, @Param("authRegionIds") List<String> authRegionIds);
     List<ShopStageInfoDO> getSubStageList(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
-    List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStageStatus") Integer shopSubStageStatus);
+    List<ShopStageInfoDO> getSubStages(@Param("shopIds") List<Long> shopIds,@Param("shopSubStage") Integer shopSubStage);
 
     /**
      * 获取线索处在某个阶段的某个状态的店铺数量
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
index 2b78e2792..b797f2d6b 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
@@ -342,7 +342,7 @@
   <select id="getSubStages" resultType="com.cool.store.entity.ShopStageInfoDO">
     select *
     from xfsg_shop_stage_info
-    where 1=1
+    where is_terminated = 1
     <if test="shopIds !=null and shopIds.size()>0">
       and shop_id in
       <foreach collection="shopIds" item="shopId" index="index" open="(" separator="," close=")">
@@ -350,7 +350,7 @@
       </foreach>
     </if>
     <if test="shopSubStage !=null">
-      and  shop_sub_stage_status =#{shopSubStageStatus}
+      and  shop_sub_stage =#{shopSubStage}
     </if>
   </select>
 </mapper>
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index 3a8bc08c2..fc5401058 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -490,16 +490,16 @@ public class DeskServiceImpl implements DeskService {
         if (ShopSubStageEnum.SHOP_STAGE_16.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
                 || ShopSubStageEnum.SHOP_STAGE_17.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())
                 || ShopSubStageEnum.SHOP_STAGE_9.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
             doThing(deskStageMap, subStageList);
         } else if (ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage());
+            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_1.getShopSubStage());
             doThing(deskStageMap, subStageList);
         } else if (ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage());
+            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_7.getShopSubStage());
             doThing(deskStageMap, subStageList);
         } else if (ShopSubStageEnum.SHOP_STAGE_11.getShopSubStage().equals(shopSubStageEnum.getShopSubStage())) {
-            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+            List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStages(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
             List<DecorationDesignInfoDO> decorationDesignInfos = decorationDesignInfoDAO.getByIds(shopIds);
             doThing(deskStageMap, subStageList);
             for (DecorationDesignInfoDO decorationDesignInfoDO : decorationDesignInfos) {