feat(activity): 增加 POS 照片任务校验逻辑

src/main/java/com/wangxiaolu/promotion/controller/activity/temporary/TemporaryActivityCoreController.java

@@ -123,27 +123,31 @@ public class TemporaryActivityCoreController {
     /**
      * 促销员[今日活动]数据提交审批
      * 修改审批状态
+     * 增加任务校验2025年11月17日16:01:47
      */
     @PutMapping("/reported/approve/submit/{id}")
     public R activityReportedSubmit(@PathVariable("id") Long id) {
         TemporaryActivityReportedDto activityReportedDto = temporaryActivityQueryService.findTemporaryActivityById(id);
-        if (activityReportedDto.getApproveStatus().equals(TemActApproveStatus.APPROVED)){
-            return R.success();
-        }
+        Boolean posFlag = CollectionUtils.isEmpty(activityReportedDto.getPosTaskClockPhotoUrls())|| activityReportedDto.getPosTaskClockPhotoUrls().size() < 1;
 
-        if (CollectionUtils.isEmpty(activityReportedDto.getTgscPhotoInfos()) || activityReportedDto.getTgscPhotoInfos().size() < 2){
-            throw new DataException(RCode.NOT_TGSH_PHOTO_ERROR);
-        }else if (CollectionUtils.isEmpty(activityReportedDto.getTghdPhotoInfos()) || activityReportedDto.getTghdPhotoInfos().size() < 2){
-            throw new DataException(RCode.NOT_TGHD_PHOTO_ERROR);
-        }else if (CollectionUtils.isEmpty(activityReportedDto.getTgcjPhotoInfos()) || activityReportedDto.getTgcjPhotoInfos().size() < 2){
-            throw new DataException(RCode.NOT_TGCJ_PHOTO_ERROR);
+        if (activityReportedDto.getApproveStatus().equals(TemActApproveStatus.APPROVED) ){
+            if (posFlag) {
+                return R.fail(RCode.NOT_POS_TASK_PHOTO_ERROR);
+            }
+            return R.success();
+        }else{
+            if (CollectionUtils.isEmpty(activityReportedDto.getTgscPhotoInfos()) || activityReportedDto.getTgscPhotoInfos().size() < 2){
+                throw new DataException(RCode.NOT_TGSH_PHOTO_ERROR);
+            }else if (CollectionUtils.isEmpty(activityReportedDto.getTghdPhotoInfos()) || activityReportedDto.getTghdPhotoInfos().size() < 2){
+                throw new DataException(RCode.NOT_TGHD_PHOTO_ERROR);
+            }else if (CollectionUtils.isEmpty(activityReportedDto.getTgcjPhotoInfos()) || activityReportedDto.getTgcjPhotoInfos().size() < 2){
+                throw new DataException(RCode.NOT_TGCJ_PHOTO_ERROR);
+            }
+            tempActivityCoreService.activityReportedSubmit(id);
+            if (posFlag) {
+                return R.fail(RCode.NOT_POS_TASK_PHOTO_ERROR);
+            }
         }
-//        if(CollectionUtils.isEmpty(activityReportedDto.getRandTaskClockPhotoUrls())|| activityReportedDto.getRandTaskClockPhotoUrls().size() < 1){
-//            throw new DataException(RCode.NOT_RAND_PHOTO_ERROR);
-//        }
-
-
-        tempActivityCoreService.activityReportedSubmit(id);
         return R.success();
     }
 

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityReportedDto.java

@@ -153,6 +153,7 @@ public class TemporaryActivityReportedDto {
      * 随机任务打卡图片
      */
     private List<TemporaryActivityPhotoDto> randTaskClockPhotoUrls;
+    private List<TemporaryActivityPhotoDto> posTaskClockPhotoUrls;
 
 
     /**

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/res/TemporaryActivityTaskClockRes.java

@@ -62,6 +62,7 @@ public class TemporaryActivityTaskClockRes {
 
     private List<String> clockPhotos;
 
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date requiredlockTime;
 
     private Boolean editableFlag = false;

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityQueryServiceImpl.java

@@ -87,6 +87,14 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
                 .setType(ActivityPhotoType.RANDOM_TASK.getType() );
         List<TemporaryActivityPhotoDto> temporaryActivityPhotoDtos = temporaryActivityPhotoDao.selectPhotos(wrapper);
         dto.setRandTaskClockPhotoUrls(temporaryActivityPhotoDtos);
+        TemporaryPhotoWrapper posWrapper = new TemporaryPhotoWrapper();
+        posWrapper.setTemporaryId(dto.getTemporaryId())
+                .setClockId(clockInfo.getId())
+                .setType(ActivityPhotoType.POS_PHOTO.getType() );
+        List<TemporaryActivityPhotoDto> posTaskClockPhotoUrls = temporaryActivityPhotoDao.selectPhotos(posWrapper);
+
+        dto.setPosTaskClockPhotoUrls(posTaskClockPhotoUrls);
+
         return dto;
     }
 

src/main/java/com/wangxiaolu/promotion/xxljobtask/ActivityStautsHandler.java

@@ -66,13 +66,24 @@ public class ActivityStautsHandler {
     @XxlJob("sendSubscribeMessage")
     public void sendSubscribeMessage() {
         DateTime undoDateTime = DateUtil.offsetMinute(new Date(), -15);
+        // 查询没有做随机任务的， 超过15分钟的，但是状态还是1进行中的  状态改成未完成，表示未拍照做任务
+        List<TemporaryActivityTaskClockDO> unstartList = taskClockService.list(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
+                .eq(TemporaryActivityTaskClockDO::getTaskStatus, ActivityClockTaskStatus.TO_BE_START.getType())
+                .eq(TemporaryActivityTaskClockDO::getTaskType, ActivityPhotoType.RANDOM_TASK.getType())
+                .eq(TemporaryActivityTaskClockDO::getIsDelete, FlagType.NO.getType())
+                // 小于等于
+                .le(TemporaryActivityTaskClockDO::getRequiredlockTime, undoDateTime));
+        for (TemporaryActivityTaskClockDO taskClockDO : unstartList){
+            taskClockDO.setIsSendSubscribe(FlagType.NO.getType());
+            taskClockDO.setTaskStatus(ActivityClockTaskStatus.UNCOMPLETED.getType());
+            taskClockService.updateById(taskClockDO);
+        }
 
         // 查询没有做随机任务的， 超过15分钟的，但是状态还是1进行中的  状态改成未完成，表示未拍照做任务
         List<TemporaryActivityTaskClockDO> undoList = taskClockService.list(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
                         .eq(TemporaryActivityTaskClockDO::getTaskStatus, ActivityClockTaskStatus.STARTING.getType())
                         .eq(TemporaryActivityTaskClockDO::getTaskType, ActivityPhotoType.RANDOM_TASK.getType())
                         .eq(TemporaryActivityTaskClockDO::getIsDelete, FlagType.NO.getType())
-//                        .eq(TemporaryActivityTaskClockDO::getIsSendSubscribe, FlagType.NO.getType())
                         // 小于等于
                         .le(TemporaryActivityTaskClockDO::getRequiredlockTime, undoDateTime));
         for (TemporaryActivityTaskClockDO taskClockDO : undoList){