From cba79701a61920fe8f267b542160716940ade3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Tue, 24 Jun 2025 20:45:48 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9AapplyType?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/dao/PreFryRecordsDAO.java |  8 +++-----
 .../cool/store/mapper/PreFryRecordsMapper.java    |  2 --
 .../main/resources/mapper/PreFryRecordsMapper.xml | 15 +++------------
 .../service/impl/PreFryRecordsServiceImpl.java    |  3 +--
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java
index 702c2b9c4..1b1a6fda7 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java
@@ -70,13 +70,11 @@ public class PreFryRecordsDAO {
     }
 
     public List<PreFryRecordsDO> selectByStoreAndDateStage(String storeCode,
-                                                           Integer applyType,
-                                                           List<Integer> yesterdayStageList,
-                                                           Integer todayStage,  String queryDate){
-        if (StringUtils.isBlank(storeCode) || CollectionUtils.isEmpty(yesterdayStageList)) {
+                                                           Integer applyType,  String queryDate){
+        if (StringUtils.isBlank(storeCode)) {
             return null;
         }
-        return preFryRecordsMapper.selectByStoreAndDateStage(storeCode,applyType,yesterdayStageList,todayStage,queryDate);
+        return preFryRecordsMapper.selectByStoreAndDateStage(storeCode,applyType,queryDate);
     }
 
     public List<DailyFryCountDTO> selectDailyFryCountInCurrentMonth(String storeCode,Long time) {
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java
index a8dceb120..085f8d109 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java
@@ -23,8 +23,6 @@ public interface PreFryRecordsMapper extends Mapper<PreFryRecordsDO> {
     List<PreFryRecordsDO> selectByStoreAndDateStage(
             @Param("storeCode") String storeCode,
             @Param("applyType") Integer applyType,
-            @Param("yesterdayStageList") List<Integer> yesterdayStageList,
-            @Param("todayStage") Integer todayStage,
             @Param("queryDate") String queryDate);
 
 
diff --git a/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml
index 67da3ff09..aabf93d4e 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml
@@ -55,18 +55,9 @@
 
   <select id="selectByStoreAndDateStage" resultMap="BaseResultMap">
     SELECT * FROM xfsg_pre_fry_records
-    WHERE store_code = #{storeCode}
-    AND (
-    (fry_date = DATE_SUB(#{queryDate}, INTERVAL 1 DAY)
-    AND current_stage IN
-    <foreach collection="yesterdayStageList" item="stage" open="(" separator="," close=")">
-      #{stage}
-    </foreach>)
-    OR  (fry_date = #{queryDate} AND current_stage = #{todayStage})
-    <if test="applyType!=null and applyType==2">
-      or (fry_date = #{queryDate} AND current_stage = 2 and current_apply_type = 2)
-    </if>
-    )
+    WHERE store_code = #{storeCode} and current_apply_type = #{applyType}
+    AND ( (fry_date = DATE_SUB(#{queryDate}, INTERVAL 1 DAY) AND current_stage IN (3,4,5)
+    OR  (fry_date = #{queryDate} AND current_stage in (1, 2) )
   </select>
 
   <select id="selectDailyFryCountInCurrentMonth" resultType="com.cool.store.dto.pre.fry.DailyFryCountDTO">
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java
index 758725d2d..e400605df 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java
@@ -177,8 +177,7 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService {
         if (dto.getCurrentDate()==null|| StringUtils.isBlank(dto.getStoreCode())){
             throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
-        List<PreFryRecordsDO> preFryRecordsDOS = preFryRecordsDAO.selectByStoreAndDateStage(dto.getStoreCode(),dto.getApplyType(), Arrays.asList(STORED_IN_FRIDGE.getCode(),
-                TAKEN_OUT_NEXT_DAY.getCode(), DISCARDED.getCode()), PRE_FRY_COMPLETED.getCode(), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,dto.getCurrentDate()));
+        List<PreFryRecordsDO> preFryRecordsDOS = preFryRecordsDAO.selectByStoreAndDateStage(dto.getStoreCode(),dto.getApplyType(), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,dto.getCurrentDate()));
         PageInfo result = new PageInfo<>(preFryRecordsDOS);
         if (CollectionUtils.isEmpty(preFryRecordsDOS)){
             return result;