同步数据发送

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<String, TaoBaoHandler> 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<JdpTrade> jdpOrderList = jdpTradeService.findJdpOrderByTime(DateUtil.parse(dateStr), DateUtil.parse(dateStr2));
-        handlerMap.size();
         return "Hello";
     }
 

service/trade-service-source/trade-service-source-core/src/test/java/com/hchbox/SlaverTest.java

@@ -120,10 +120,18 @@ public class SlaverTest {
 
     @Test
     public void getAccount() {
-        List<SellerAccount> allByParentId = sellerAccountRepository.findAllByParentId(2L);
+        try {
-        for (SellerAccount sellerAccount : allByParentId) {
+            for (int i = 0; i < 100; i++) {
+                if (i== 1){
+                    int i1 = 10 / 0;
+                }
+                System.out.println(i);
 
             }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
 
     }
 

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<SellerAccount, Lo
     List<SellerAccount> queryChildrenSellerAccounts(Long parentId);
 
 
-    /**
-     * 时间查询
-     * @param date
-     * @param zeroNumber
-     * @return
-     */
-    @Query("from SellerAccount s where s.freeSyncEndTime < ?1 and s.parentId = ?2")
-    List<SellerAccount> queryUnexpiredAccounts(Date date, Long zeroNumber);
 
     /**
      * 修改账号状态

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;
 
 

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<JdpTrade> findJdpOrderByTime(Date lastUpdateTime, Date endTime) {
         return jdpTradeRepository.findJdpTradeByTime(lastUpdateTime, endTime);
     }

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);
     }
+
+
 }

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()) {