新增第三方单据上传过滤

src/main/java/com/glxp/api/constant/Constant.java

@@ -284,6 +284,7 @@ public class Constant {
     public static final String ORDER_ACTION_SUP_DELAUDIT = "supDelAudit";
     public static final String ORDER_ACTION_SUP_INOUT = "supInout";
     public static final String ORDER_ACTION_SUP_PREIN = "preInOrder";
+    public static final String ORDER_THIRD_UPLOAD = "thirdUpload";
 
     public static final String SYNC_REMARK = "syncRemark";
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -10,16 +10,21 @@ import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.thrsys.ThrOrderUploadBustypesEntity;
 import com.glxp.api.req.basic.FilterBussinessTypeRequest;
 import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.system.SystemParamConfigService;
+import com.glxp.api.service.thrsys.ThrOrderUploadBustypesService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -34,6 +39,8 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
     private CustomerService customerService;
     @Resource
     private BasicBussinessTypeDao basicBussinessTypeDao;
+    @Resource
+    private ThrOrderUploadBustypesService thrOrderUploadBustypesService;
 
     @Override
     public List<BasicBussinessTypeResponse> filterList(FilterBussinessTypeRequest filterBussinessTypeRequest) {
@@ -257,6 +264,19 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
                 bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>()
                         .gt("spUse", 0).eq("enable", true).eq("corpType", ConstantStatus.CORP_TYPE_OUT).eq("actionType", 2)
                         .eq("inStock", true).eq("mainAction", ConstantType.TYPE_PUT));
+                break;
+            case Constant.ORDER_THIRD_UPLOAD:
+
+                List<ThrOrderUploadBustypesEntity> thrOrderUploadBustypesEntities = thrOrderUploadBustypesService.list();
+                List<String> actions = new ArrayList<>();
+                thrOrderUploadBustypesEntities.forEach(item ->
+                {
+                    actions.add(item.getAction());
+                });
+                if (CollUtil.isNotEmpty(actions)) {
+                    bussinessTypeEntities = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>().in("action", actions));
+                }
+                break;
 
             default:
                 break;

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

@@ -8,6 +8,7 @@ import com.glxp.api.entity.system.SyncDataSetEntity;
 import com.glxp.api.req.system.ScheduledRequest;
 import com.glxp.api.service.sync.HeartService;
 import com.glxp.api.util.RedisUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,12 +21,11 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.Arrays;
 
-
+@Slf4j
 @Component
 @EnableScheduling
 public class SyncHeartTask implements SchedulingConfigurer {
 
-    final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);
     @Resource
     protected ScheduledDao scheduledDao;
     @Resource
@@ -45,7 +45,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
                     ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest);
                     String cron = scheduledEntity.getCron();
                     if (cron.isEmpty()) {
-                        logger.error("cron is null");
+                        log.error("cron is null");
                     }
                     return new CronTrigger(cron).nextExecutionTime(triggerContext);
                 });
@@ -54,12 +54,10 @@ public class SyncHeartTask implements SchedulingConfigurer {
 
     private void process() {
 
-        logger.info("数据同步心跳");
+        log.info("数据同步心跳--");
         //查询数据同步设置
         SyncDataSetEntity syncDataSetEntity = syncDataSetDao.selectSet();
         if (syncDataSetEntity.isDownstreamEnable()) {
-
-
             //定时上传最近更新基础数据至上游轮询时间
             long timeInterval1 = syncDataSetEntity.getSyncTime() * 6 * 1000L;
             long curTime1 = System.currentTimeMillis();
@@ -82,7 +80,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
                     redisUtil.set("SPS_SYNC_UPLOAD_DATA", curTime1);
                 }
             } catch (Exception e) {
-                logger.error(ExceptionUtils.getStackTrace(e));
+                log.error(ExceptionUtils.getStackTrace(e));
                 e.printStackTrace();
 
             }
@@ -103,7 +101,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
                     redisUtil.set("SPS_SYNC_UPLOAD_ORDER", curTime2);
                 }
             } catch (Exception e) {
-                logger.error(ExceptionUtils.getStackTrace(e));
+                log.error(ExceptionUtils.getStackTrace(e));
                 e.printStackTrace();
             }
 
@@ -121,13 +119,13 @@ public class SyncHeartTask implements SchedulingConfigurer {
                     heartService.dlAllOrder();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    logger.error(ExceptionUtils.getStackTrace(e));
+                    log.error(ExceptionUtils.getStackTrace(e));
                 }
                 try {
                     heartService.dlAllDiProducts();
                 } catch (Exception e) {
                     e.printStackTrace();
-                    logger.error(ExceptionUtils.getStackTrace(e));
+                    log.error(ExceptionUtils.getStackTrace(e));
                 }
                 Arrays.stream(BasicExportTypeEnum.values()).forEach(i -> {
                     heartService.pullData(i);

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

@@ -277,7 +277,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
 
             long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
             if (curTime - lastTime < timeInterval) {
-                log.info("定时任务时间未到", taskKey);
+                log.info("定时任务时间未到---" + taskKey);
                 return false;
             } else {
                 return true;