feat(promotion): 完善打卡图片保存和删除逻辑

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

@@ -76,6 +76,12 @@ public class TemporaryActivityClockCoreController {
         return R.success();
     }
 
+    /**
+     * 促销员-打卡（上班卡）
+     * @param clockVo
+     * @return
+     */
+
     @PostMapping("/today/v2/clock")
     public R clockInTodayActivityV2(@RequestBody TemporaryClockVo clockVo) {
         clockVo.validate();

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/TemporaryActivityPhotoDao.java

@@ -44,4 +44,6 @@ public interface TemporaryActivityPhotoDao {
     void saveClockTaskPhoto(TemporaryActivityPhotoDto dto, List<String> clockPhtos);
 
     List<TemporaryActivityPhotoDto> selectPhotos(TemporaryPhotoWrapper clockId);
+
+    void deleteListByClockId(Long clockId, Integer taskType);
 }

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityPhotoDaoImpl.java

@@ -156,6 +156,17 @@ public class TemporaryActivityPhotoDaoImpl implements TemporaryActivityPhotoDao
         return photoDtos;
     }
 
+    @Override
+    public void deleteListByClockId(Long clockId, Integer taskType) {
+
+        // 根据clockId 和图片类型 删除图片
+        temporaryActivityPhotoMapper.delete(new LambdaQueryWrapper<TemporaryActivityPhotoDO>()
+                .eq(TemporaryActivityPhotoDO::getClockId, clockId)
+                .eq(TemporaryActivityPhotoDO::getType, taskType)
+                .eq(TemporaryActivityPhotoDO::getIsDelete, StatusType.VALID.getType()));
+
+    }
+
 
     /**
      * 活动上报图片查询

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityTaskClockDaoImpl.java

@@ -29,6 +29,7 @@ public class TemporaryActivityTaskClockDaoImpl implements TemporaryActivityTaskC
     public List<TemporaryActivityTaskClockDO> selectList(TemporaryActivityTaskWrapperDto wrapper) {
         List<TemporaryActivityTaskClockDO> temporaryActivityTaskClockDOS = temporaryActivityTaskClockMapper.selectList(new LambdaQueryWrapper<TemporaryActivityTaskClockDO>()
                 .eq(ObjectUtil.isNotEmpty(wrapper.getTemporaryId()), TemporaryActivityTaskClockDO::getTemporaryId, wrapper.getTemporaryId())
+                .eq(ObjectUtil.isNotEmpty(wrapper.getClockId()), TemporaryActivityTaskClockDO::getClockId, wrapper.getClockId())
                 .eq(ObjectUtil.isNotEmpty(wrapper.getUserId()), TemporaryActivityTaskClockDO::getTemporaryId, wrapper.getUserId())
                 .eq(ObjectUtil.isNotEmpty(wrapper.getIsDelete()), TemporaryActivityTaskClockDO::getIsDelete, wrapper.getIsDelete())
                 .orderByAsc(TemporaryActivityTaskClockDO::getTaskType));

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

@@ -136,6 +136,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
         String userId = AuthUtils.getUserId(token);
         TemporaryActivityTaskWrapperDto wrapper = new TemporaryActivityTaskWrapperDto()
                 .setUserId(Long.parseLong(userId))
+                .setClockId(null)
                 .setTemporaryId(Long.parseLong(userId))
                 .setIsDelete(FlagType.NO.getType());
         List<TemporaryActivityTaskClockDO> list = temporaryActivityTaskClockDao.selectList(wrapper);
@@ -173,10 +174,10 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
         TemporaryActivityPhotoDto dto = new TemporaryActivityPhotoDto();
         dto.setClockId(taskClockDO.getClockId())
                 .setTemporaryId(taskClockDO.getTemporaryId())
-                .setReportedId(taskClockDO.getReportedId())
+                .setClockId(taskClockDO.getClockId())
                 .setType(clockVo.getTaskType());
         if (CollectionUtils.isEmpty(clockVo.getClockPhotos())) {
-            photoDao.deleteList(taskClockDO.getReportedId(), clockVo.getTaskType());
+            photoDao.deleteListByClockId(taskClockDO.getClockId(), clockVo.getTaskType());
         } else {
             // 保存打卡图片
             photoDao.saveClockTaskPhoto(dto, clockVo.getClockPhotos());
@@ -201,7 +202,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
             BeanUtils.copyProperties(taskClockDO, res);
             // 查询图片
             TemporaryPhotoWrapper photoWrapper = new TemporaryPhotoWrapper()
-                    .setReportedId(taskClockDO.getReportedId())
+                    .setClockId(taskClockDO.getClockId())
                     .setTemporaryId(taskClockDO.getTemporaryId());
             List<TemporaryActivityPhotoDto> photoDtos = photoDao.selectPhotos(photoWrapper);
             List<String> photoUrls = photoDtos.stream()