Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java

@@ -850,7 +850,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         ioCollectOrderBackupService.save(ioCollectOrderBackup);
         //todo 备份码表
         IoCollectOrder finalCollectOrder = collectOrder;
-        ThreadUtil.execAsync(() -> {
         //插入到码表
         collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
         //删除原来单据
@@ -858,14 +857,14 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         //更新数据至第三方系统
         //单据更新
 //                    ioCollectOrderBackupService.generateOrder(finalCollectOrder.getBillNo(), authAdmin);
-                    IoCollectSet ioCollectSet = collectSetService.getSet();
-                    Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
 
-                    if (autoUploadOrder) {
-                        ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
-                    }
-                }
-        );
+        //不立马上传，等待定时器自动上传
+//        IoCollectSet ioCollectSet = collectSetService.getSet();
+//        Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
+//        if (autoUploadOrder) {
+//            ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), authAdmin);
+//        }
+
     }
 
     public void busGenOrder(CollectOrderRequest collectOrderRequest) {

src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java

@@ -55,18 +55,18 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
                     // 使用设置的轮询时间为准 这边进行转换
                     IoCollectSet ioCollectSet = collectSetService.getSet();
                     String cron = null;
-                    if(ioCollectSet!= null
-                            && ioCollectSet.getStartUploadHour() !=null
-                            && ioCollectSet.getStartUploadHour() >0
-                    ){
-                        if(ioCollectSet.getStartUploadHour() <= 24){
-                            cron =  "0 0 */"+ioCollectSet.getStartUploadHour()+" * * ? ";
+                    if (ioCollectSet != null
+                            && ioCollectSet.getStartUploadHour() != null
+                            && ioCollectSet.getStartUploadHour() > 0
+                    ) {
+                        if (ioCollectSet.getStartUploadHour() <= 24) {
+                            cron = "0 0 */" + ioCollectSet.getStartUploadHour() + " * * ? ";
 
                         }
-                    }else {
+                    } else {
                         cron = "0 0 0 */1 * ?";
                     }
-                    logger.info("已完成单据自动上传轮询设置cron表达式==="+cron);
+                    logger.info("已完成单据自动上传轮询设置cron表达式===" + cron);
 
                     if (cron.isEmpty()) {
                         logger.error("cron is null");
@@ -76,7 +76,6 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
     }
 
     private void process() {
-        ThreadUtil.execAsync(() -> {
 
         //获取下载的起始时间
         IoCollectSet ioCollectSet = collectSetService.getSet();
@@ -84,7 +83,7 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
         String startUploadTimes = MsDateUtil.formatDateTime(startUploadTime);
         Boolean autoUploadOrder = ioCollectSet.getAutoUploadOrder();
 
-            if (StrUtil.isNotBlank(startUploadTimes) && autoUploadOrder){
+        if (StrUtil.isNotBlank(startUploadTimes) && autoUploadOrder) {
             //获取当前时间
             String paramValue = startUploadTimes;
             String nowTime = MsDateUtil.getDateTime();
@@ -99,10 +98,10 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
 
             //调用上传单据
             List<IoCollectOrderResponse> orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest);
-                if (CollUtil.isNotEmpty(orderResponses)){
-                    orderResponses.forEach( item -> {
+            if (CollUtil.isNotEmpty(orderResponses)) {
+                orderResponses.forEach(item -> {
                     AuthAdmin authAdmin = new AuthAdmin();
-                        ioCollectOrderBackupService.orderUpload(item.getBillNo(),authAdmin);
+                    ioCollectOrderBackupService.orderUpload(item.getBillNo(), authAdmin);
                 });
             }
             // 无限循环去上传单据不做限制了
@@ -110,7 +109,6 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer {
 //                collectSetService.updateById(ioCollectSet);
         }
 
-        });
     }
 
 }