黑五

data-base/base-sync-finance-ebay/src/main/java/com/bailuntec/job/EbayFinanceAdSyncJob.java

@@ -53,7 +53,7 @@ public class EbayFinanceAdSyncJob extends PointJob {
 
             if (startTime.toLocalDate().compareTo(LocalDate.now()) < 0) {
 
-                listByPage.parallelStream().forEach(jobAccountLog -> {
+                listByPage.forEach(jobAccountLog -> {
                     //先删除再更新
                     dcBaseFinanceEbayMapper.deleteByExample(DcBaseFinanceEbayExample.newAndCreateCriteria()
                             .andBjDateBetween(startTime, endTime)

data-base/base-sync-finance-ebay/src/test/java/com/bailuntec/job/EbayFinanceAdSyncJobTest.java

@@ -84,15 +84,37 @@ public class EbayFinanceAdSyncJobTest {
     public void testThreadPool() {
         EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
 
-        LocalDateTime start = LocalDateTime.of(2020, 11, 17, 0, 0);
-        LocalDateTime end = LocalDateTime.of(2020, 11, 19, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2020, 11, 18, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2020, 12, 2, 0, 0);
 
         List<LocalDateTime> localDateTimeList = Stream.iterate(start,
                 localDateTime -> localDateTime.plusDays(1))
                 .limit(ChronoUnit.DAYS.between(start, end) + 1)
                 .collect(Collectors.toList());
 
-        localDateTimeList.parallelStream().forEach(localDateTime -> {
+        localDateTimeList.forEach(localDateTime -> {
+            JobPointLog jobPointLog = new JobPointLog();
+            jobPointLog.setStartTime(localDateTime);
+            jobPointLog.setEndTime(localDateTime.plusDays(1));
+            ebayFinanceAdSyncJob.executeJob(null, jobPointLog);
+        });
+
+    }
+
+
+    @Test
+    public void testThreadPool2() {
+        EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
+
+        LocalDateTime start = LocalDateTime.of(2020, 11, 25, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2020, 12, 2, 0, 0);
+
+        List<LocalDateTime> localDateTimeList = Stream.iterate(start,
+                localDateTime -> localDateTime.plusDays(1))
+                .limit(ChronoUnit.DAYS.between(start, end) + 1)
+                .collect(Collectors.toList());
+
+        localDateTimeList.forEach(localDateTime -> {
             JobPointLog jobPointLog = new JobPointLog();
             jobPointLog.setStartTime(localDateTime);
             jobPointLog.setEndTime(localDateTime.plusDays(1));

data-common/src/main/java/com/bailuntec/mapper/DcAutoSalesMapper.xml

@@ -3139,6 +3139,10 @@
                 and warehouse_code = #{warehouseCode}
                 and !(paid_time >= '2020-11-11 00:00:00' and paid_time <= '2020-11-13 00:00:00' and
                       platform_type = 'Aliexpress')
+                and !(paid_time >= '2020-11-23 00:00:00' and paid_time <= '2020-11-28 00:00:00' and
+                      platform_type = 'Aliexpress')
+                and !(paid_time >= '2020-11-23 00:00:00' and paid_time <= '2020-12-06 00:00:00' and
+                      platform_type = 'FBA')
                 and platform_order_type != '手工单'
              ) sales_table
 

data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsSkuMapper.xml

@@ -3738,6 +3738,9 @@
                   and has_buyer_remark = 0
                   and has_platsku_remark = 0
                   and has_innersale = 0
+                  and !(paid_time >= '2020-11-23 00:00:00' and paid_time <= '2020-12-06 00:00:00' and
+                        platform_type = 'FBA')
+                  and platform_order_type != '手工单'
                ) / #{days}
     </select>
 

data-common/src/main/resources/mybatis-config.xml

@@ -5,8 +5,8 @@
 <configuration>
 
     <!--<properties  resource="db-tj.properties"/>-->
-    <properties resource="db-dev.properties"/>
-    <!--    <properties resource="db-prod.properties"/>-->
+    <!--    <properties resource="db-dev.properties"/>-->
+    <properties resource="db-prod.properties"/>
     <settings>
         <setting name="mapUnderscoreToCamelCase" value="true"/>
     </settings>