|
|
|
@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.time.LocalTime;
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
@ -72,8 +73,10 @@ public class TimerTaskServiceImpl implements TimerTaskService {
|
|
|
|
|
}
|
|
|
|
|
// 获取卖家账号信息
|
|
|
|
|
SellerAccount sellerAccount = sellerAccountRepository.findSellerAccountById(userId);
|
|
|
|
|
|
|
|
|
|
// 查询可发送子账号
|
|
|
|
|
List<String> subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId());
|
|
|
|
|
List<String> subNickList = Arrays.asList(as.getSendAccountIds().split(StrUtil.COMMA));
|
|
|
|
|
// List<String> subNickList = sellerAccountRepository.findByParentId(sellerAccount.getId());
|
|
|
|
|
if (CollectionUtils.isEmpty(subNickList)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
@ -170,7 +173,7 @@ public class TimerTaskServiceImpl implements TimerTaskService {
|
|
|
|
|
|
|
|
|
|
private AutoTaskMessage createAutoTaskMessage(AppSetting setting, String template) {
|
|
|
|
|
DateTime date = DateUtil.date();
|
|
|
|
|
AutoTaskMessage message = autoTaskMessageRepository.findAutoTaskMessageTypeBetweenTime(setting.getType(), DateUtil.beginOfDay(date), DateUtil.endOfDay(date));
|
|
|
|
|
AutoTaskMessage message = autoTaskMessageRepository.findAutoTaskMessageTypeBetweenTime(setting.getType(), DateUtil.beginOfDay(date), DateUtil.endOfDay(date), setting.getSellerNick());
|
|
|
|
|
if (message != null) {
|
|
|
|
|
return message;
|
|
|
|
|
}
|
|
|
|
|