bug fix

data-base/base-sync-crm-refund/src/main/resources/job.properties

@@ -8,7 +8,7 @@ EVENT_RDB_STORAGE_USERNAME=root
 EVENT_RDB_STORAGE_PASSWORD=#7kfnymAM$Y9-Ntf
 ZOOKEEPER_SERVER=172.31.255.120:2181
 NAME_SPACE=data-center
-JOB_NAME=base-sync-crm-refund
+JOB_NAME=base-sync-crm-refun3
 #JOB_NAME=base-sync-crm-refund-update
 JOB_CRON=0/1 * * * * ?
 JOB_LINK_NAME=base-link-crm-refund

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

@@ -107,8 +107,8 @@ public class EbayFinanceAdSyncJobTest {
     public void testThreadPool2() {
         EbayFinanceAdSyncJob ebayFinanceAdSyncJob = new EbayFinanceAdSyncJob();
 
-        LocalDateTime start = LocalDateTime.of(2020, 12, 23, 0, 0);
-        LocalDateTime end = LocalDateTime.of(2020, 12, 25, 0, 0);
+        LocalDateTime start = LocalDateTime.of(2020, 12, 27, 0, 0);
+        LocalDateTime end = LocalDateTime.of(2020, 12, 29, 0, 0);
 
         List<LocalDateTime> localDateTimeList = Stream.iterate(start,
                 localDateTime -> localDateTime.plusDays(1))

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>

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -134,6 +134,10 @@ public class AutoTurnoverJob extends PointJob {
 
                             try {
                                 String queryTime = DateTimeFormatter.ofPattern(CommonConstant.DATE_FORMAT).format(LocalDate.now());
+                                dcBaseStock = SessionUtil.getSession().getMapper(DcBaseStockMapper.class).selectOneByExample(DcBaseStockExample.newAndCreateCriteria()
+                                        .andBailunSkuEqualTo(dcBaseStock.getBailunSku())
+                                        .andWarehouseCodeEqualTo(dcBaseStock.getWarehouseCode())
+                                        .example());
                                 this.autoTurnoverFromStock(queryTime, dcBaseStock);
                             } catch (Exception e) {
                                 //错误记录到日志表, 任务跑完了再跑一次错误SKU
@@ -146,6 +150,8 @@ public class AutoTurnoverJob extends PointJob {
                                 } finally {
                                     SessionUtil.closeSession();
                                 }
+                            } finally {
+                                SessionUtil.closeSession();
                             }
                         });
             }