fix(temporary):修复打卡任务状态更新逻辑

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

@@ -261,11 +261,11 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
             tempActivityPhotoDao.deleteList(reportedId, ActivityPhotoType.TGHD.getType());
         } else {
             // 查询打卡数据 根据上报id 查询
-            TemporaryClockWrapper wr = new TemporaryClockWrapper();
-            wr.setReportedId(reportedId);
-            wr.setTemporaryId(temporaryId);
-            TemporaryClockDto clockDto = clockQueryService.findClockInfo(wr);
-            tempActivityPhotoDao.saveReportedList(clockDto.getId(), temporaryId, reportedId, ActivityPhotoType.TGHD.getType(), temActDto.getTghdPhotoUrls());
+//            TemporaryClockWrapper wr = new TemporaryClockWrapper();
+//            wr.setReportedId(reportedId);
+//            wr.setTemporaryId(temporaryId);
+//            TemporaryClockDto clockDto = clockQueryService.findClockInfo(wr);
+            tempActivityPhotoDao.saveReportedList(null, temporaryId, reportedId, ActivityPhotoType.TGHD.getType(), temActDto.getTghdPhotoUrls());
         }
 
         // 推广成交照片
@@ -273,12 +273,12 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
             tempActivityPhotoDao.deleteList(reportedId, ActivityPhotoType.TGCJ.getType());
         } else {
             // 查询打卡数据 根据上报id 查询
-            TemporaryClockWrapper wr = new TemporaryClockWrapper();
-            wr.setReportedId(reportedId);
-            wr.setTemporaryId(temporaryId);
-            TemporaryClockDto clockDto = clockQueryService.findClockInfo(wr);
+//            TemporaryClockWrapper wr = new TemporaryClockWrapper();
+//            wr.setReportedId(reportedId);
+//            wr.setTemporaryId(temporaryId);
+//            TemporaryClockDto clockDto = clockQueryService.findClockInfo(wr);
 
-            tempActivityPhotoDao.saveReportedList(clockDto.getId(), temporaryId, reportedId, ActivityPhotoType.TGCJ.getType(), temActDto.getTgcjPhotoUrls());
+            tempActivityPhotoDao.saveReportedList(null, temporaryId, reportedId, ActivityPhotoType.TGCJ.getType(), temActDto.getTgcjPhotoUrls());
         }
         // POS机页面凭证
 //        if (!CollectionUtils.isEmpty(temActDto.getPsvPhotoUrls())) {

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

@@ -168,11 +168,15 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
             }
         }
         BeanUtils.copyProperties(clockVo, taskClockDO);
-        // 更新 任务状态为未完成，打卡时间为当前时间
-        taskClockDO.setTaskStatus(ActivityClockTaskStatus.COMPLETED.getType());
+
+        if(CollectionUtils.isEmpty(clockVo.getClockPhotos())){
+            // 更新 任务状态为未完成，打卡时间为当前时间
+            taskClockDO.setTaskStatus(ActivityClockTaskStatus.COMPLETED.getType());
+        }else{
+            taskClockDO.setTaskStatus(ActivityClockTaskStatus.STARTING.getType());
+        }
         taskClockDO.setReportedId(null);
         taskClockDO.setClockTime(new Date());
-
         temporaryActivityTaskClockDao.update(taskClockDO);