|
@@ -428,7 +428,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
|
|
|
|
|
|
// 查询条件
|
|
|
CustomerServiceReceiveWrapper.CustomerServiceReceiveQuery receiveQuery = CustomerServiceReceiveWrapper.CustomerServiceReceiveQuery
|
|
|
- .builder().build();
|
|
|
+ .builder().batchSendingId(info.getId()).build();
|
|
|
|
|
|
Page<CustomerServiceReceiveWrapper.CustomerServiceReceive> page = PageUtil.getPage(1, 10);
|
|
|
// 推送消息给指定用户
|
|
@@ -459,7 +459,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
|
|
|
.eq(CustomerServiceBatchSending::getId, info.getId())
|
|
|
.set(CustomerServiceBatchSending::getSendStatus, EImSendStatus.SEND)
|
|
|
.set(CustomerServiceBatchSending::getReceiveNumber, receiveNums.stream().mapToInt(Integer::intValue).sum())
|
|
|
- //.set(CustomerServiceBatchSending::getSendTime, DateTime.now().toDate())
|
|
|
+ .set(CustomerServiceBatchSending::getSendTime, Optional.ofNullable(info.getSendTime()).orElse(DateTime.now().toDate()))
|
|
|
.update();
|
|
|
|
|
|
} catch (Exception e) {
|
|
@@ -553,7 +553,7 @@ public class CustomerServiceBatchSendingServiceImpl extends ServiceImpl<Customer
|
|
|
|
|
|
// 定时发送时间
|
|
|
// 开始时间
|
|
|
- Date startTime = DateTime.now().minusMinutes(1).toDate();
|
|
|
+ Date startTime = DateTime.now().minusMinutes(2).toDate();
|
|
|
// 结束时间
|
|
|
Date endTime = DateTime.now().toDate();
|
|
|
|