From 0fb27391dc55279cbf582689b3650e85b86fde33 Mon Sep 17 00:00:00 2001 From: bynt Date: Fri, 19 Nov 2021 20:02:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=8F=91?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hchbox/controller/TestController.java | 4 ---- .../src/test/java/com/hchbox/SlaverTest.java | 12 ++++++++++-- .../repository/master/SellerAccountRepository.java | 8 -------- .../java/com/hchbox/service/TopTradeService.java | 3 +++ .../hchbox/service/impl/JdpTradeServiceImpl.java | 1 - .../hchbox/service/impl/TopTradeServiceImpl.java | 13 +++++++++++++ .../src/main/java/com/hchbox/task/SyncTask.java | 1 - 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TestController.java b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TestController.java index a74109f..5da79c2 100644 --- a/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TestController.java +++ b/service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/TestController.java @@ -3,7 +3,6 @@ package com.hchbox.controller; import cn.hutool.core.date.DateUtil; import com.hchbox.entity.slaver.JdpTrade; import com.hchbox.hander.TaoBaoHandler; -import com.hchbox.hander.message.TaoBaoMessage; import com.hchbox.service.JdpTradeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -25,8 +24,6 @@ import java.util.Map; @RequestMapping("/source") public class TestController { - @Autowired - private Map handlerMap; @@ -38,7 +35,6 @@ public class TestController { String dateStr = "2021-04-21 01:02:03"; String dateStr2 = "2021-10-22 15:09:15"; List jdpOrderList = jdpTradeService.findJdpOrderByTime(DateUtil.parse(dateStr), DateUtil.parse(dateStr2)); - handlerMap.size(); return "Hello"; } diff --git a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java index 26b8037..84f9b4b 100644 --- a/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java +++ b/service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java @@ -120,11 +120,19 @@ public class SlaverTest { @Test public void getAccount() { - List allByParentId = sellerAccountRepository.findAllByParentId(2L); - for (SellerAccount sellerAccount : allByParentId) { + try { + for (int i = 0; i < 100; i++) { + if (i== 1){ + int i1 = 10 / 0; + } + System.out.println(i); + } + }catch (Exception e){ + e.printStackTrace(); } + } @Test diff --git a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/SellerAccountRepository.java b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/SellerAccountRepository.java index 50b557a..2a349d1 100644 --- a/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/SellerAccountRepository.java +++ b/service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/SellerAccountRepository.java @@ -102,14 +102,6 @@ public interface SellerAccountRepository extends JpaRepository queryChildrenSellerAccounts(Long parentId); - /** - * 时间查询 - * @param date - * @param zeroNumber - * @return - */ - @Query("from SellerAccount s where s.freeSyncEndTime < ?1 and s.parentId = ?2") - List queryUnexpiredAccounts(Date date, Long zeroNumber); /** * 修改账号状态 diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java index 3b8326a..2f9dc0f 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/TopTradeService.java @@ -14,9 +14,12 @@ import com.hchbox.vo.PageVo; import com.hchbox.vo.taobao.TaoBaoOrderResponseVO; import com.hchbox.vo.taobao.TaoBaoOrderSearchVO; import com.hchbox.vo.taobao.TradeDecryptVo; +import com.taobao.api.ApiException; +import com.taobao.api.SecretException; import com.taobao.api.request.TradesSoldGetRequest; import com.taobao.api.response.TopOaidDecryptResponse; +import java.util.Date; import java.util.List; diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/JdpTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/JdpTradeServiceImpl.java index 8896d83..292c261 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/JdpTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/JdpTradeServiceImpl.java @@ -22,7 +22,6 @@ public class JdpTradeServiceImpl implements JdpTradeService { private final JdpTradeRepository jdpTradeRepository; @Override - public List findJdpOrderByTime(Date lastUpdateTime, Date endTime) { return jdpTradeRepository.findJdpTradeByTime(lastUpdateTime, endTime); } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java index 1c9f820..7b0e81b 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java @@ -11,12 +11,14 @@ import cn.hutool.extra.emoji.EmojiUtil; import cn.hutool.json.JSONUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.google.common.base.Joiner; +import com.google.common.collect.Lists; import com.hchbox.api.TaoBaoApiClient; import com.hchbox.config.DataSourceConfiguration; import com.hchbox.config.MiProperties; import com.hchbox.constant.*; import com.hchbox.dto.SellerAccountDTO; import com.hchbox.entity.master.*; +import com.hchbox.entity.slaver.JdpTrade; import com.hchbox.enums.AppSettingTypeEnum; import com.hchbox.enums.RefundStatusEnum; import com.hchbox.enums.ResponseCode; @@ -32,15 +34,20 @@ import com.hchbox.repository.master.TopOrderRegistry; import com.hchbox.repository.master.TopTradeRepository; import com.hchbox.service.*; import com.hchbox.uitl.RemindTemplates; +import com.hchbox.uitl.TaoBaoEncryption; import com.hchbox.util.*; import com.hchbox.vo.PageVo; import com.hchbox.vo.taobao.TaoBaoOrderResponseVO; import com.hchbox.vo.taobao.TaoBaoOrderSearchVO; import com.hchbox.vo.taobao.TradeDecryptVo; +import com.taobao.api.ApiException; +import com.taobao.api.SecretException; import com.taobao.api.domain.Trade; +import com.taobao.api.internal.util.TaobaoUtils; import com.taobao.api.request.TopOaidDecryptRequest; import com.taobao.api.request.TradesSoldGetRequest; import com.taobao.api.response.TopOaidDecryptResponse; +import com.taobao.api.response.TradeFullinfoGetResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -69,10 +76,14 @@ public class TopTradeServiceImpl implements TopTradeService { @Value("${hchbox.sub-tables}") private Integer tableSum; + private final MiProperties miProperties; + private final MemberService memberService; + private final JdpTradeService jdpTradeService; + private final TopOrderService topOrderService; private final TopOrderRegistry topOrderRegistry; @@ -598,4 +609,6 @@ public class TopTradeServiceImpl implements TopTradeService { public TopTrade findByTid(Long tid) { return topTradeRepository.findByTid(tid); } + + } diff --git a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/SyncTask.java b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/SyncTask.java index a383b22..2f378b5 100644 --- a/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/SyncTask.java +++ b/service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/task/SyncTask.java @@ -150,7 +150,6 @@ public class SyncTask { sellerAccount.getMessageCount() : DefaultNumberConstants.ZERO_NUMBER; int totalAmount = messageCount + trades.size(); sellerAccountService.updateMessageCount(sellerAccount.getId(), totalAmount); - // TODO 同步数据发送 if (sellerAccount.getMassNum() != null && sellerAccount.getMassNum() > DefaultNumberConstants.ZERO_NUMBER && totalAmount > sellerAccount.getMassNum()) {