suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：预炸1

Browse Source
This commit is contained in:
苏竹红
2025-06-24 16:19:02 +08:00
parent 9b1aafb60b
commit d4a2123434
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/PreFryRecordsDAO.java
View File

@@ -70,12 +70,13 @@ public class PreFryRecordsDAO {
} }
public List<PreFryRecordsDO> selectByStoreAndDateStage(String storeCode, public List<PreFryRecordsDO> selectByStoreAndDateStage(String storeCode,
Integer applyType,
List<Integer> yesterdayStageList, List<Integer> yesterdayStageList,
Integer todayStage, String queryDate){ Integer todayStage, String queryDate){
if (StringUtils.isBlank(storeCode) || CollectionUtils.isEmpty(yesterdayStageList)) { if (StringUtils.isBlank(storeCode) || CollectionUtils.isEmpty(yesterdayStageList)) {
return null; return null;
} }
return preFryRecordsMapper.selectByStoreAndDateStage(storeCode,yesterdayStageList,todayStage,queryDate); return preFryRecordsMapper.selectByStoreAndDateStage(storeCode,applyType,yesterdayStageList,todayStage,queryDate);
} }
public List<DailyFryCountDTO> selectDailyFryCountInCurrentMonth(String storeCode,Long time) { public List<DailyFryCountDTO> selectDailyFryCountInCurrentMonth(String storeCode,Long time) {

1
coolstore-partner-dao/src/main/java/com/cool/store/mapper/PreFryRecordsMapper.java
View File

@@ -22,6 +22,7 @@ public interface PreFryRecordsMapper extends Mapper<PreFryRecordsDO> {
List<PreFryRecordsDO> selectByStoreAndDateStage( List<PreFryRecordsDO> selectByStoreAndDateStage(
@Param("storeCode") String storeCode, @Param("storeCode") String storeCode,
@Param("applyType") Integer applyType,
@Param("yesterdayStageList") List<Integer> yesterdayStageList, @Param("yesterdayStageList") List<Integer> yesterdayStageList,
@Param("todayStage") Integer todayStage, @Param("todayStage") Integer todayStage,
@Param("queryDate") String queryDate); @Param("queryDate") String queryDate);

2
coolstore-partner-dao/src/main/resources/mapper/PreFryRecordsMapper.xml
View File

@@ -63,7 +63,7 @@
#{stage} #{stage}
</foreach>) </foreach>)
OR (fry_date = #{queryDate} AND current_stage = #{todayStage}) OR (fry_date = #{queryDate} AND current_stage = #{todayStage})
<if test="current_apply_type!=null and current_apply_type==2"> <if test="applyType!=null and applyType==2">
or (fry_date = #{queryDate} AND current_stage = 2 and current_apply_type = 2) or (fry_date = #{queryDate} AND current_stage = 2 and current_apply_type = 2)
</if> </if>
) )

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PreFryRecordsServiceImpl.java
View File

@@ -167,7 +167,7 @@ public class PreFryRecordsServiceImpl implements PreFryRecordsService {
if (dto.getCurrentDate()==null|| StringUtils.isBlank(dto.getStoreCode())){ if (dto.getCurrentDate()==null|| StringUtils.isBlank(dto.getStoreCode())){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED); throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
} }
List<PreFryRecordsDO> preFryRecordsDOS = preFryRecordsDAO.selectByStoreAndDateStage(dto.getStoreCode(), Arrays.asList(STORED_IN_FRIDGE.getCode(), 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())); TAKEN_OUT_NEXT_DAY.getCode(), DISCARDED.getCode()), PRE_FRY_COMPLETED.getCode(), DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,dto.getCurrentDate()));
PageInfo result = new PageInfo<>(preFryRecordsDOS); PageInfo result = new PageInfo<>(preFryRecordsDOS);
if (CollectionUtils.isEmpty(preFryRecordsDOS)){ if (CollectionUtils.isEmpty(preFryRecordsDOS)){