|
|
@ -5,9 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
|
|
|
import com.google.common.base.Splitter;
|
|
|
|
|
|
|
|
import com.google.gson.JsonArray;
|
|
|
|
|
|
|
|
import com.hchbox.config.MiProperties;
|
|
|
|
import com.hchbox.config.MiProperties;
|
|
|
|
import com.hchbox.constant.DefaultConstants;
|
|
|
|
import com.hchbox.constant.DefaultConstants;
|
|
|
|
import com.hchbox.constant.PayConstants;
|
|
|
|
import com.hchbox.constant.PayConstants;
|
|
|
@ -21,7 +18,7 @@ import com.hchbox.feign.ApiSendMessageClient;
|
|
|
|
import com.hchbox.hander.message.TaoBaoTradeMessage;
|
|
|
|
import com.hchbox.hander.message.TaoBaoTradeMessage;
|
|
|
|
import com.hchbox.repository.master.AutoTaskMessageInfoRepository;
|
|
|
|
import com.hchbox.repository.master.AutoTaskMessageInfoRepository;
|
|
|
|
import com.hchbox.repository.master.AutoTaskMessageRepository;
|
|
|
|
import com.hchbox.repository.master.AutoTaskMessageRepository;
|
|
|
|
import com.hchbox.repository.master.OrderRegistry;
|
|
|
|
import com.hchbox.repository.master.TopOrderRegistry;
|
|
|
|
import com.hchbox.repository.master.TopTradeRepository;
|
|
|
|
import com.hchbox.repository.master.TopTradeRepository;
|
|
|
|
import com.hchbox.service.*;
|
|
|
|
import com.hchbox.service.*;
|
|
|
|
import com.hchbox.util.CacheManagerUtil;
|
|
|
|
import com.hchbox.util.CacheManagerUtil;
|
|
|
@ -35,7 +32,6 @@ import org.springframework.beans.BeanUtils;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
import springfox.documentation.spring.web.json.Json;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.time.LocalTime;
|
|
|
|
import java.time.LocalTime;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
@ -53,7 +49,7 @@ import java.util.stream.Stream;
|
|
|
|
public class TopTradeServiceImpl implements TopTradeService {
|
|
|
|
public class TopTradeServiceImpl implements TopTradeService {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final OrderRegistry orderRegistry;
|
|
|
|
private final TopOrderRegistry orderRegistry;
|
|
|
|
|
|
|
|
|
|
|
|
private final MiProperties miProperties;
|
|
|
|
private final MiProperties miProperties;
|
|
|
|
|
|
|
|
|
|
|
@ -186,7 +182,7 @@ public class TopTradeServiceImpl implements TopTradeService {
|
|
|
|
// 使用本地数据
|
|
|
|
// 使用本地数据
|
|
|
|
Trade trade = topTradeRepository.findByTid(tid);
|
|
|
|
Trade trade = topTradeRepository.findByTid(tid);
|
|
|
|
if (trade != null) {
|
|
|
|
if (trade != null) {
|
|
|
|
List<Order> topOrders = orderRegistry.findByTid(tid);
|
|
|
|
List<Order> topOrders = trade.getOrders();
|
|
|
|
List<Order> orders = new ArrayList<>();
|
|
|
|
List<Order> orders = new ArrayList<>();
|
|
|
|
if (CollectionUtils.isEmpty(topOrders)) {
|
|
|
|
if (CollectionUtils.isEmpty(topOrders)) {
|
|
|
|
orders.addAll(topOrders);
|
|
|
|
orders.addAll(topOrders);
|
|
|
@ -212,7 +208,6 @@ public class TopTradeServiceImpl implements TopTradeService {
|
|
|
|
AutoTaskMessageInfoDTO dto = new AutoTaskMessageInfoDTO();
|
|
|
|
AutoTaskMessageInfoDTO dto = new AutoTaskMessageInfoDTO();
|
|
|
|
// 创建对象
|
|
|
|
// 创建对象
|
|
|
|
BeanUtils.copyProperties(createAutoTaskMessageInfo(template, setting, sendNickList, trade, taskId), dto);
|
|
|
|
BeanUtils.copyProperties(createAutoTaskMessageInfo(template, setting, sendNickList, trade, taskId), dto);
|
|
|
|
//TODO 调用远端接口发送
|
|
|
|
|
|
|
|
apiSendMessageClient.taskMessageSending(dto);
|
|
|
|
apiSendMessageClient.taskMessageSending(dto);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -305,18 +300,17 @@ public class TopTradeServiceImpl implements TopTradeService {
|
|
|
|
return message.getId();
|
|
|
|
return message.getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Integer type = setting.getType();
|
|
|
|
Integer type = setting.getType();
|
|
|
|
// 若不存在,则创建一个
|
|
|
|
// 创建新应用
|
|
|
|
message = new AutoTaskMessage();
|
|
|
|
message = new AutoTaskMessage();
|
|
|
|
message.setStartDt(date);
|
|
|
|
message.setStartDate(date);
|
|
|
|
message.setTaskName(AppSettingTypeEnum.valueOf(type));
|
|
|
|
message.setTemplate(template);
|
|
|
|
message.setTaksInfo(StrUtil.EMPTY);
|
|
|
|
message.setTaskInfo(StrUtil.EMPTY);
|
|
|
|
message.setIsRemark(DefaultConstants.ZERO_NUMBER);
|
|
|
|
message.setIsFinish(Boolean.FALSE);
|
|
|
|
message.setIsOver(DefaultConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
message.setStatus(DefaultConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
message.setType(DefaultConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
message.setSendType(setting.getType());
|
|
|
|
message.setSendType(setting.getType());
|
|
|
|
message.setTemplt(template);
|
|
|
|
|
|
|
|
message.setSellerNick(setting.getSellerNick());
|
|
|
|
message.setSellerNick(setting.getSellerNick());
|
|
|
|
|
|
|
|
message.setStatus(DefaultConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
message.setSendType(DefaultConstants.ZERO_NUMBER);
|
|
|
|
|
|
|
|
message.setTaskName(AppSettingTypeEnum.valueOf(type));
|
|
|
|
return autoTaskMessageRepository.save(message).getId();
|
|
|
|
return autoTaskMessageRepository.save(message).getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|