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

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -162,6 +162,7 @@ public class IoOrderController extends BaseController {
             if (ioOrderResponse.getCheckStatus() == null) {
                 ioOrderResponse.setCheckStatus(0 + "");
             }
+            ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
 
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -99,8 +99,6 @@ public class HeartService {
     IoOrderDetailCodeService orderDetailCodeService;
     @Resource
     IoOrderDetailResultService orderDetailResultService;
-    @Resource
-    IoOrderInvoiceService orderInvoiceService;
 
     @Resource
     IoOrderInvoiceMapper ioOrderInvoiceMapper;
@@ -1995,15 +1993,6 @@ public class HeartService {
             }
         }
 
-        //更新发票信息
-//        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
-//            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
-//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-//                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-//                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
-//                }
-//            }
-//        }
     }
 
 

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

@@ -289,7 +289,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
      */
     private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) {
         String taskKey = getTaskKey(thrSystemDetailEntity);
-        ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
+         ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
         if (null != vo && !vo.isFinished()) {
             log.info(vo.getKey() + "有任务尚未执行完成，当前任务key：{}", taskKey);
             return false;
@@ -298,12 +298,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
         if (vo != null) {
             long lastTime = vo.getNextTime();
 
-            long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
+             long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
             if (curTime - lastTime < timeInterval) {
                 log.info("定时任务时间未到---" + taskKey);
                 return false;
             } else {
-                return true;
+                 return true;
             }
         } else {
             vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo());