完成部分定时任务

coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java

@@ -8,6 +8,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -50,4 +51,7 @@ public class AcceptanceInfoDAO {
         }
         return acceptanceInfoMapper.selectByShopIds(shopIds);
     }
+    public List<AcceptanceInfoDO> selectByEntryTimeNull(){
+        return acceptanceInfoMapper.selectByEntryTimeNull();
+    }
 }

coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopStageInfoDAO.java

@@ -186,9 +186,11 @@ public class ShopStageInfoDAO {
         ShopSubStageStatusEnum shopSubStageStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21;
         return shopStageInfoMapper.getRentContractToDoPage(userId, shopSubStageStatus.getShopSubStageEnum().getShopSubStage(), shopSubStageStatus.getShopSubStageStatus());
     }
-    public Page<Long> getShopIdListByStageStatus( Integer pageNum, Integer pageSize){
-        PageHelper.startPage(pageNum, pageSize);
-       return shopStageInfoMapper.getShopIdListByStageStatus();
+    public  List<ShopStageInfoDO> getShopIdListByStageStatus(Integer shopSubStageStatus){
+        if (shopSubStageStatus == null ||shopSubStageStatus ==CommonConstants.ZERO){
+            return null;
+        }
+       return shopStageInfoMapper.getShopIdListByStageStatus(shopSubStageStatus);
     }
 
     public List<ScheduleDTO> getScheduleList(List<Long> shopIdList){

coolstore-partner-dao/src/main/java/com/cool/store/mapper/AcceptanceInfoMapper.java

@@ -30,5 +30,5 @@ public interface AcceptanceInfoMapper extends Mapper<AcceptanceInfoDO> {
      * @Date: 2024/5/3
      * @description:查询进场时间为空的数据
      */
-    List<AcceptanceInfoDO> selectListByActualEntryTime();
+    List<AcceptanceInfoDO> selectByEntryTimeNull();
 }

coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopStageInfoMapper.java

@@ -100,12 +100,8 @@ public interface ShopStageInfoMapper extends Mapper<ShopStageInfoDO> {
      * @return
      */
     Page<RentInfoToDoVO> getRentContractToDoPage(@Param("userId") String userId, @Param("shopSubStage")Integer shopSubStage, @Param("shopSubStageStatus") Integer shopSubStageStatus);
-    /**
-     * @Auther: wangshuo
-     * @Date: 2024/4/25
-     * @description:获取处于订货金阶段的shopid
-     */
-    Page<Long> getShopIdListByStageStatus();
+
+    List<ShopStageInfoDO> getShopIdListByStageStatus(@Param("shopSubStageStatus") Integer shopSubStageStatus);
 
     List<ScheduleDTO> getScheduleList(@Param("shopIds") List<Long> shopIds);
 

coolstore-partner-dao/src/main/resources/mapper/AcceptanceInfoMapper.xml

@@ -93,7 +93,7 @@
         from xfsg_acceptance_info
         where shop_id = #{shopId} and deleted = 0
     </select>
-    <select id="selectListByActualEntryTime" resultType="com.cool.store.entity.AcceptanceInfoDO">
+    <select id="selectByEntryTimeNull" resultType="com.cool.store.entity.AcceptanceInfoDO">
         select
         <include refid="baseColumn"/>
         from xfsg_acceptance_info

coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

@@ -161,11 +161,7 @@
     where
       a.shop_sub_stage = #{shopSubStage} and a.shop_sub_stage_status = #{shopSubStageStatus} and a.deleted = 0 and b.deleted = 0 and b.investment_manager = #{userId}
   </select>
-  <select id="getShopIdListByStageStatus" resultType="java.lang.Long">
-    select shop_id
-    from xfsg_shop_stage_info
-    where shop_stage = 2 and shop_sub_stage = 150 and shop_sub_stage_status= 1505 and is_terminated = 0
-  </select>
+
 
   <select id="getScheduleList" resultType="com.cool.store.dto.Preparation.ScheduleDTO">
     select
@@ -266,4 +262,9 @@
      and  shop_sub_stage =#{shopSubStage}
     </if>
   </select>
+  <select id="getShopIdListByStageStatus" resultType="com.cool.store.entity.ShopStageInfoDO">
+    select *
+    from xfsg_shop_stage_info
+    where  shop_sub_stage_status = #{shopSubStageStatus}
+  </select>
 </mapper>