提交 cf2111df authored 作者: 吕本才's avatar 吕本才

feat(promotion): 临时修改时间到1点30

上级 4f888928
...@@ -42,7 +42,7 @@ public enum ActivityPhotoType { ...@@ -42,7 +42,7 @@ public enum ActivityPhotoType {
/** /**
* 当日销量POS机页面凭证 * 当日销量POS机页面凭证
*/ */
POS_SELL_VOUCHER(7), POS_SELL_VOUCHER(8),
/** /**
* POS照片 * POS照片
......
...@@ -149,7 +149,9 @@ public class TemporaryActivityReportedDto { ...@@ -149,7 +149,9 @@ public class TemporaryActivityReportedDto {
private List<TemporaryActivityPhotoDto> psvPhotoInfos; private List<TemporaryActivityPhotoDto> psvPhotoInfos;
private List<String> psvChangePhotoUrls; private List<String> psvChangePhotoUrls;
/**
* 随机任务打卡图片
*/
private List<TemporaryActivityPhotoDto> randTaskClockPhotoUrls; private List<TemporaryActivityPhotoDto> randTaskClockPhotoUrls;
......
...@@ -21,7 +21,6 @@ import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto; ...@@ -21,7 +21,6 @@ import com.wangxiaolu.promotion.pojo.activity.temporary.dto.TemporaryClockDto;
import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService; import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityClockQueryService;
import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityQueryService; import com.wangxiaolu.promotion.service.activity.temporary.TemporaryActivityQueryService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
...@@ -75,6 +74,7 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery ...@@ -75,6 +74,7 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
public TemporaryActivityReportedDto findTemporaryActivityById(Long activityId) { public TemporaryActivityReportedDto findTemporaryActivityById(Long activityId) {
TemporaryActivityReportedDto dto = temporaryActivityReportedDao.findOneById(activityId); TemporaryActivityReportedDto dto = temporaryActivityReportedDao.findOneById(activityId);
findActivityReportedPhotoInfo(dto); findActivityReportedPhotoInfo(dto);
// 验证随机任务照片数量 上周提到每天下午5:30~7:30的随机拍照一次的任务(客流量大的时候要保证促销员在售卖位置) // 验证随机任务照片数量 上周提到每天下午5:30~7:30的随机拍照一次的任务(客流量大的时候要保证促销员在售卖位置)
TemporaryClockWrapper wer = new TemporaryClockWrapper(); TemporaryClockWrapper wer = new TemporaryClockWrapper();
wer.setTemporaryId(dto.getTemporaryId()) wer.setTemporaryId(dto.getTemporaryId())
......
...@@ -71,7 +71,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary ...@@ -71,7 +71,7 @@ public class TemporaryActivityTaskClockServiceImpl extends ServiceImpl<Temporary
} }
// 随机生成 下午5:30~7:30 之间的Date // 随机生成 下午5:30~7:30 之间的Date
LocalTime randomTime = LocalTime.of(17, 30, 0).plusMinutes(ThreadLocalRandom.current().nextInt(0, 120)); LocalTime randomTime = LocalTime.of(13, 30, 0).plusMinutes(ThreadLocalRandom.current().nextInt(0, 30));
Date randomDate = DateUtils.parseDateByLocalTime(randomTime); Date randomDate = DateUtils.parseDateByLocalTime(randomTime);
// 生成 // 生成
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论