diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
index 408c6869d..4a631e943 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageEnum.java
@@ -63,6 +63,16 @@ public enum ShopSubStageEnum {
         this.planCompleteDays = planCompleteDays;
     }
 
+    public static Integer getTotalStageIsLocationAndPreparation() {
+        int total=0;
+        for (ShopSubStageEnum shopStageEnum : ShopSubStageEnum.values()) {
+            if (shopStageEnum.getShopStageEnum().getShopStage().equals(ShopStageEnum.SHOP_STAGE_1.getShopStage())
+                    ||shopStageEnum.getShopStageEnum().getShopStage().equals(ShopStageEnum.SHOP_STAGE_2.getShopStage())) {
+                total++;
+            }
+        }
+    }
+
     public static List<ShopSubStageEnum> getShopStageEnum(Integer shopStage) {
         List<ShopSubStageEnum> resultList = new ArrayList<>();
         for (ShopSubStageEnum shopStageEnum : ShopSubStageEnum.values()) {
diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
index 7d4e122bb..d1fa69bd7 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
@@ -415,6 +415,6 @@
         from
         xfsg_shop_stage_info
         where
-        shop_id = #{shopId} and deleted = 0 and is_terminated = 1
+        shop_id = #{shopId} and deleted = 0 and is_terminated = 1 and shop_stage in (1,2)
     </select>
 </mapper>
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index e4df4987a..fdc6ad087 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -432,7 +432,7 @@ public class ShopServiceImpl implements ShopService {
             throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
         }
         Integer completionCount = shopStageInfoDAO.getCompletionCount(shopId);
-        if (completionCount.equals(ShopSubStageEnum.values().length)) {
+        if (completionCount.equals(ShopSubStageEnum.getTotalStageIsLocationAndPreparation())) {
             shopInfo.setShopStatus(ShopStatusEnum.DONE.getCode());
         } else {
             shopInfo.setShopStatus(ShopStatusEnum.ING.getCode());