update

data-base/base-sync-finance-ebay/src/test/java/EbayFinanceSyncJobTest.java

@@ -37,9 +37,9 @@ public class EbayFinanceSyncJobTest {
         ExecutorService threadPool = Executors.newFixedThreadPool(300);
 
         //获取时间区间reportDate列表
-        List<LocalDateTime> localDateList = Stream.iterate(LocalDateTime.of(2020, 8, 31, 0, 0), localDate -> localDate.plusDays(1))
-                .limit(ChronoUnit.DAYS.between(LocalDateTime.of(2020, 8, 31, 0, 0),
-                        LocalDateTime.of(2020, 10, 2, 0, 0)) + 1)
+        List<LocalDateTime> localDateList = Stream.iterate(LocalDateTime.of(2020, 9, 30, 0, 0), localDate -> localDate.plusDays(1))
+                .limit(ChronoUnit.DAYS.between(LocalDateTime.of(2020, 9, 30, 0, 0),
+                        LocalDateTime.of(2020, 11, 2, 0, 0)) + 1)
                 .collect(Collectors.toList());
         localDateList.forEach(localDateTime -> {
 

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -1113,7 +1113,6 @@ public class OrderSyncJob extends PointJob {
         }
     }
 
-
     /**
      * 拿SkU基础信息
      *
@@ -1136,7 +1135,6 @@ public class OrderSyncJob extends PointJob {
         return skuProductInfo;
     }
 
-
     /**
      * 检查FBA费用是否异常
      *

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -21,10 +21,12 @@ public class OmsOrderTest {
     public void test1() {
         OkHttpClient okHttpClient = OkHttpUtil.getInstance();
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
-        map.put("pageIndex", "239");
+        map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("BailunLastUpdateTimeFrom", "2019-04-11 11:45:33");
-        map.put("BailunLastUpdateTimeTo", "2019-04-11 16:17:03");
+//        map.put("BailunLastUpdateTimeFrom", "2019-04-11 11:45:33");
+//        map.put("BailunLastUpdateTimeTo", "2019-04-11 16:17:03");
+        //OriginOrderNo=112-7750508-3145827
+        map.put("OriginOrderNo","WS202005111851016291F39C");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))

data-base/base-sync-purchase-details/Dockerfile

@@ -20,4 +20,4 @@ RUN cd /usr/app/data-parent && mvn -T 1C install  -pl ../data-base/base-sync-pur
 
 #指定容器启动程序及参数   <ENTRYPOINT> "<CMD>"
 EXPOSE 8080
-ENTRYPOINT ["java","-Xms80m","-Xmx300m","-jar","/usr/app/data-base/base-sync-purchase-details/target/base-sync-purchase-details-1.0-SNAPSHOT.jar"]
+ENTRYPOINT ["java","-Xms80m","-Xmx300m","-jar","/usr/app/datSyncPurchaseDetailsJoba-base/base-sync-purchase-details/target/base-sync-purchase-details-1.0-SNAPSHOT.jar"]
\ No newline at end of file

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -135,7 +135,6 @@ public class BalanceSheetService {
         getSemiTransferAmount(lastDay, today); // 获取半成品在途
     }
 
-
     @Scheduled(cron = "0 30 2 * * *") // 每天凌晨2点半运行一次
     public void doScheduledTask0100() {
         Date lastDay = DateTimeUtil.getCurrentLastDay();