fix

datacenter-domain/src/main/resources/com/bailuntec/mapper/DcMidTransitMapper.xml

@@ -149,11 +149,11 @@
                    and t1.isdeleted = 0
                    and t1.isexception = 0
                  UNION ALL
-                 SELECT bailun_sku,
-                        warehouse_code,
+                 SELECT warehouse_code,
+                        bailun_sku,
+                        transport_type,
                         `count`,
-                        `count` AS countplan,
-                        transport_type
+                        `count` AS countplan
                  FROM dc_base_transfer_plan
                  WHERE STATUS = 1
                    AND deleted = 0

datacenter-job/datacenter-base/base-sync-ebay-transaction/src/main/java/com/bailuntec/job/service/impl/SyncEbayFeeServiceImpl.java

@@ -70,6 +70,7 @@ public class SyncEbayFeeServiceImpl implements SyncEbayFeeService {
                 new LambdaQueryWrapper<DcBaseCompanyAccount>()
                         .in(DcBaseCompanyAccount::getAccountId, accountIdList)
                         .in(DcBaseCompanyAccount::getAccountName, RUN_ACCOUNT)
+                        .eq(DcBaseCompanyAccount::getAuthStatus,2)
         );
         //循环跑任务
         List<EbayAccountReportTask> needUpdateEbayAccountReportTaskList = new ArrayList<>();

datacenter-job/datacenter-finance/finance-balance-sheet/pom.xml

@@ -22,6 +22,10 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
         </dependency>

datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/BalanceSheetJob.java

@@ -181,5 +181,4 @@ public class BalanceSheetJob {
         }
     }
 
-
 }

datacenter-job/datacenter-finance/finance-balance-sheet/src/main/java/com/bailuntec/job/service/BalanceSheetService.java

 package com.bailuntec.job.service;
 
-import com.alibaba.fastjson.JSON;
 import com.bailuntec.api.bailuntec.cw.CwApi;
 import com.bailuntec.api.bailuntec.cw.response.BankAccountBalanceDTO;
 import com.bailuntec.api.bailuntec.cw.response.BorrowBalanceDTO;

datacenter-job/datacenter-finance/finance-balance-sheet/src/main/resources/application-test.yml

@@ -28,4 +28,4 @@ feign:
         connectTimeout: 30000
         readTimeout: 30000
 server:
-  port: 1226
+  port: 8080

datacenter-job/datacenter-mid/mid-calculate-transit/src/main/java/com/bailuntec/job/service/MidCalculateTransitService.java

 package com.bailuntec.job.service;
 
+import com.bailuntec.api.bailuntec.exceptionless.ExceptionlessApi;
+import com.bailuntec.api.bailuntec.exceptionless.ExceptionlessInput;
 import com.bailuntec.application.IDcMidTransitService;
 import com.bailuntec.common.ListUtil;
 import com.bailuntec.domain.DcJobConfig;
@@ -8,12 +10,14 @@ import com.bailuntec.infrastructure.common.BaseJobSqlParam;
 import com.bailuntec.infrastructure.mapper.DcJobConfigMapper;
 import com.bailuntec.infrastructure.mapper.DcMidTransitMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * <p>
@@ -33,6 +37,11 @@ public class MidCalculateTransitService {
     DcJobConfigMapper dcJobConfigMapper;
     @Resource
     IDcMidTransitService dcMidTransitService;
+    @Resource
+    ExceptionlessApi exceptionlessApi;
+
+    @Value("${exceptionless.token}")
+    private String exceptionlessToken;
 
     private final static String midCalculateOutStockQuantity = "mid-calculate-out-stock-quantity";
     private final static String midCalculatePurchaseTransitQuantity = "mid-calculate-purchase-transit-quantity";
@@ -46,7 +55,15 @@ public class MidCalculateTransitService {
         int pageNum = dcJobConfig.getPageNum();
         dcMidTransitMapper.clearOutStockQuantity();
         for (; ; ) {
-            List<DcMidTransit> dcMidTransitList = dcMidTransitMapper.selectOutStockQuantity(BaseJobSqlParam.newInstance(dcJobConfig));
+            BaseJobSqlParam param = BaseJobSqlParam.newInstance(dcJobConfig);
+            List<DcMidTransit> dcMidTransitList = dcMidTransitMapper.selectOutStockQuantity(param);
+            ExceptionlessInput input = ExceptionlessInput.builder()
+                    .source("midCalculateOutStockQuantity")
+                    .message("执行时间："+LocalDateTime.now().toString())
+                    .data(param)
+                    .build();
+            CompletableFuture.runAsync(() -> exceptionlessApi
+                    .events(exceptionlessToken,input));
             if (ListUtil.isEmpty(dcMidTransitList)) {
                 break;
             }

datacenter-job/datacenter-mid/mid-calculate-transit/src/main/resources/application-prod.yml

@@ -18,7 +18,8 @@ mybatis-plus:
 #  configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
-
+exceptionless:
+  token: Bearer WE1p75z6Ga0qHZFF4kvDr1ysuMv6DDvxp2ap4ACP
 
 feign:
   hystrix:

datacenter-job/datacenter-mid/mid-calculate-transit/src/main/resources/application-test.yml

@@ -18,6 +18,8 @@ mybatis-plus:
 #  configuration:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
+exceptionless:
+  token: Bearer WE1p75z6Ga0qHZFF4kvDr1ysuMv6DDvxp2ap4ACP
 
 feign:
   hystrix: