|
|
@ -92,11 +92,12 @@ public class DeliveryBalanceTask {
|
|
|
|
UserDto userInfo = userService.findUserInfo(userId);
|
|
|
|
UserDto userInfo = userService.findUserInfo(userId);
|
|
|
|
if (ObjectUtil.isNotNull(userInfo)
|
|
|
|
if (ObjectUtil.isNotNull(userInfo)
|
|
|
|
&& Boolean.TRUE.equals(userInfo.getEnabled())
|
|
|
|
&& Boolean.TRUE.equals(userInfo.getEnabled())
|
|
|
|
&& ObjectUtil.isNotNull(channelCustom)) {
|
|
|
|
&& ObjectUtil.isNotNull(channelCustom)) {
|
|
|
|
Integer dmpLimitNum = channelCustom.getDmpLimitNum();
|
|
|
|
Integer dmpLimitNum = channelCustom.getDmpLimitNum();
|
|
|
|
// 找出两天之内未兑换的数量
|
|
|
|
// 找出两天之内未兑换的数量
|
|
|
|
Integer number = deliveryRecordService.queryNumberByDateAndUser
|
|
|
|
Integer number = deliveryRecordService.queryNumberByDateAndUser
|
|
|
|
(DateUtil.offsetDay(DateUtil.date(), DefaultNumberConstants.MINUS_TWO_NUMBER), DefaultNumberConstants.ZERO_NUMBER, userId);
|
|
|
|
(DateUtil.offsetDay(DateUtil.date(), DefaultNumberConstants.MINUS_TWO_NUMBER),
|
|
|
|
|
|
|
|
DefaultNumberConstants.ZERO_NUMBER, userId);
|
|
|
|
// 判断剩余数量
|
|
|
|
// 判断剩余数量
|
|
|
|
if (ObjectUtil.isNull(channelCustom.getSurplusNum()) || ObjectUtil.isNull(dmpLimitNum)
|
|
|
|
if (ObjectUtil.isNull(channelCustom.getSurplusNum()) || ObjectUtil.isNull(dmpLimitNum)
|
|
|
|
|| channelCustom.getSurplusNum() - (number != null ? number : DefaultNumberConstants.ZERO_NUMBER) >>
|
|
|
|
|| channelCustom.getSurplusNum() - (number != null ? number : DefaultNumberConstants.ZERO_NUMBER) >>
|
|
|
@ -169,7 +170,7 @@ public class DeliveryBalanceTask {
|
|
|
|
Long maxId = (long) DefaultNumberConstants.ZERO_NUMBER;
|
|
|
|
Long maxId = (long) DefaultNumberConstants.ZERO_NUMBER;
|
|
|
|
// 接口最小20 邮件最小50
|
|
|
|
// 接口最小20 邮件最小50
|
|
|
|
if (taskImeiList.size() >= (Boolean.TRUE.equals(typeResult)
|
|
|
|
if (taskImeiList.size() >= (Boolean.TRUE.equals(typeResult)
|
|
|
|
? DefaultNumberConstants.TWENTY_NUMBER : DefaultNumberConstants.FIFTY)) {
|
|
|
|
? DefaultNumberConstants.FIFTY : DefaultNumberConstants.TWENTY_NUMBER)) {
|
|
|
|
String fileUrl = deliveryProperties.getFileUrl();
|
|
|
|
String fileUrl = deliveryProperties.getFileUrl();
|
|
|
|
Comparator<TaskImei> comparing = Comparator.comparing(TaskImei::getId);
|
|
|
|
Comparator<TaskImei> comparing = Comparator.comparing(TaskImei::getId);
|
|
|
|
// 最小id
|
|
|
|
// 最小id
|
|
|
@ -181,10 +182,9 @@ public class DeliveryBalanceTask {
|
|
|
|
// 转换DTO
|
|
|
|
// 转换DTO
|
|
|
|
List<ImeiDTO> toList = Convert.toList(ImeiDTO.class, taskImeiList);
|
|
|
|
List<ImeiDTO> toList = Convert.toList(ImeiDTO.class, taskImeiList);
|
|
|
|
String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.BY.getCacheName());
|
|
|
|
String taskImeiName = redisUtils.acquisitionBatch(MailRequestEnum.BY.getCacheName());
|
|
|
|
|
|
|
|
CommonLog.info("兑换,当前tag值为".concat(toList.get(DefaultNumberConstants.ZERO_NUMBER).getTag()));
|
|
|
|
if (Boolean.TRUE.equals(typeResult)) {
|
|
|
|
if (Boolean.TRUE.equals(typeResult)) {
|
|
|
|
String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName);
|
|
|
|
String file = fileUrl.concat(StrPool.SLASH).concat(taskImeiName);
|
|
|
|
CommonLog.info("发送邮件,当前tag值为".concat(toList.get(DefaultNumberConstants.ZERO_NUMBER).getTag()));
|
|
|
|
|
|
|
|
SendMailDTO sendMailDTO = FileAndMailUtil.zipFileAndSendDMPMail(toList, file, taskImeiName, deliveryProperties, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
SendMailDTO sendMailDTO = FileAndMailUtil.zipFileAndSendDMPMail(toList, file, taskImeiName, deliveryProperties, DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
if (sendMailDTO.getSendResult().equals(Boolean.TRUE)) {
|
|
|
|
if (sendMailDTO.getSendResult().equals(Boolean.TRUE)) {
|
|
|
|
// 保存发送记录
|
|
|
|
// 保存发送记录
|
|
|
|