feat(activity): 引入临时活动打卡查询服务

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

@@ -7,6 +7,7 @@ import com.fasterxml.uuid.Generators;
 import com.wangxiaolu.promotion.common.redis.RedisKeys;
 import com.wangxiaolu.promotion.common.redis.service.RedisCache;
 import com.wangxiaolu.promotion.domain.activity.dao.*;
+import com.wangxiaolu.promotion.domain.activity.wrapperQo.TemporaryClockWrapper;
 import com.wangxiaolu.promotion.domain.activityplanv2.dao.ActivityPlanInfoDao;
 import com.wangxiaolu.promotion.domain.user.dao.TemporaryInfoDao;
 import com.wangxiaolu.promotion.enums.activity.ActivityPhotoType;
@@ -18,9 +19,11 @@ import com.wangxiaolu.promotion.pojo.activity.planv2.dto.ActivityPlanInfoDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.PromotionStoreDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityMarketCellDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryActivityReportedDto;
+import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
 import com.wangxiaolu.promotion.pojo.activity.temporary.vo.TemporaryActivityMarketCellVo;
 import com.wangxiaolu.promotion.pojo.user.dto.WxTemporaryInfoDto;
 import com.wangxiaolu.promotion.result.basedata.RCode;
+import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService;
 import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityCoreService;
 import com.wangxiaolu.promotion.utils.QinCeUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -61,6 +64,8 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
     private TemporaryActivityMarketCellDao temporaryActivityMarketCellDao;
     @Autowired
     private ActivityPlanInfoDao activityPlanInfoDao;
+    @Autowired
+    private TemporaryActivityClockQueryService clockQueryService;
 
 
     /**
@@ -162,7 +167,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
     }
 
     @Override
-    public void todayActivityDeleteMarketCellReported( Long temporaryId) {
+    public void todayActivityDeleteMarketCellReported(Long temporaryId) {
         String key = temMarketCellRedisKey(temporaryId);
         redisCache.removeKey(key);
     }
@@ -175,17 +180,17 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
         }
 
         //  修改/删除 DB库中的数据
-        if (Objects.nonNull(marketcellVo.getMarketCellId())){
+        if (Objects.nonNull(marketcellVo.getMarketCellId())) {
             todayUpdateMarketCellOneToDb(marketcellVo);
         }
     }
 
     private void todayUpdateMarketCellOneToDb(TemporaryActivityMarketCellVo marketcellVo) {
-        if (marketcellVo.operateIsDelete()){
+        if (marketcellVo.operateIsDelete()) {
             temporaryActivityMarketCellDao.deleteById(marketcellVo.getMarketCellId());
         }
 
-        if (marketcellVo.operateIsUpdate()){
+        if (marketcellVo.operateIsUpdate()) {
             TemporaryActivityMarketCellDto dto = new TemporaryActivityMarketCellDto()
                     .setId(marketcellVo.getMarketCellId())
                     .setBag(marketcellVo.getBag())
@@ -232,7 +237,7 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
         }
     }
 
-    private String temMarketCellRedisKey( Long temporaryId) {
+    private String temMarketCellRedisKey(Long temporaryId) {
         return RedisKeys.TemporaryKeys.TEMPORARY_ACTIVITY_MARKET_CELL.getKey() + temporaryId + "_" + DateUtil.today();
     }
 
@@ -246,23 +251,34 @@ public class TemporaryActivityCoreServiceImpl implements TemporaryActivityCoreSe
         Long reportedId = temActDto.getId();
         // 推广试吃照片
         if (CollectionUtils.isEmpty(temActDto.getTgscPhotoUrls())) {
-            tempActivityPhotoDao.deleteList(reportedId,ActivityPhotoType.TGSC.getType());
-        }else  {
-            tempActivityPhotoDao.saveReportedList(null,temporaryId, reportedId, ActivityPhotoType.TGSC.getType(), temActDto.getTgscPhotoUrls());
+            tempActivityPhotoDao.deleteList(reportedId, ActivityPhotoType.TGSC.getType());
+        } else {
+            tempActivityPhotoDao.saveReportedList(null, temporaryId, reportedId, ActivityPhotoType.TGSC.getType(), temActDto.getTgscPhotoUrls());
         }
 
         // 推广互动照片
         if (CollectionUtils.isEmpty(temActDto.getTghdPhotoUrls())) {
-            tempActivityPhotoDao.deleteList(reportedId,ActivityPhotoType.TGHD.getType());
-        }else {
-            tempActivityPhotoDao.saveReportedList(temActDto.getClockDto().getId(),temporaryId, reportedId, ActivityPhotoType.TGHD.getType(), temActDto.getTghdPhotoUrls());
+            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());
         }
 
         // 推广成交照片
         if (CollectionUtils.isEmpty(temActDto.getTgcjPhotoUrls())) {
-            tempActivityPhotoDao.deleteList(reportedId,ActivityPhotoType.TGCJ.getType());
-        }else {
-            tempActivityPhotoDao.saveReportedList(temActDto.getClockDto().getId(),temporaryId, reportedId, ActivityPhotoType.TGCJ.getType(), temActDto.getTgcjPhotoUrls());
+            tempActivityPhotoDao.deleteList(reportedId, ActivityPhotoType.TGCJ.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.TGCJ.getType(), temActDto.getTgcjPhotoUrls());
         }
         // POS机页面凭证
 //        if (!CollectionUtils.isEmpty(temActDto.getPsvPhotoUrls())) {

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

@@ -98,6 +98,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
      *
      * @param dto
      */
+
     @Override
     public void generatePosUploadTask(TemporaryClockDto dto) {
         // 查询是否已有数据