完善逻辑

src/main/java/com/usky/dxtop/model/SysAsyncTask.java

@@ -1,7 +1,5 @@
 package com.usky.dxtop.model;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.usky.dxtop.common.core.domain.BaseEntity;
 import lombok.Data;
 
@@ -12,7 +10,6 @@ import java.util.Date;
  */
 @Data
 public class SysAsyncTask extends BaseEntity {
-    @TableId(type = IdType.AUTO)
     //任务id
     private Long id;
     //

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -305,7 +305,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public String exportDetail(OrderRequest orderRequest) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
-        Long taskId = sysAsyncTaskService.getId(user.getUserName(), AsyncResultType.FILE.name());
+        Long taskId = sysAsyncTaskService.getId(user.getUserName(), "订单详情");
         if (null == taskId) {
             throw new CustomException("获取次数太多了请稍后获取");
         }
@@ -355,7 +355,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         sysFile.setBatchNo(batchNo);
         sysFile.setFiles(list);
         sysFile.setUploadType(SysFileServiceImpl.FILE);
-        sysFile.setBusinessType("订单报表导出");
+        sysFile.setBusinessType("订单详情");
         sysFile.setExpriceAt(DateUtils.addDays(new Date(), 3));
         List<SysFile> sysFileList = sysFileService.addFile(sysFile);
         long count = sysFileList.stream().filter(sysFileDTO -> !sysFileDTO.getSuccess()).count();
@@ -424,7 +424,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public String reportExport(Date startTime, Date endTime, Integer type) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         SysUser user = loginUser.getUser();
-        Long taskId = sysAsyncTaskService.getId(user.getUserName(), AsyncResultType.FILE.name());
+        Long taskId = sysAsyncTaskService.getId(user.getUserName(), "订单报表");
         if (null == taskId) {
             throw new CustomException("获取次数太多了请稍后获取");
         }
@@ -470,7 +470,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         sysFile.setBatchNo(batchNo);
         sysFile.setFiles(list);
         sysFile.setUploadType(SysFileServiceImpl.FILE);
-        sysFile.setBusinessType("订单");
+        sysFile.setBusinessType("订单报表");
         sysFile.setExpriceAt(DateUtils.addDays(new Date(), 3));
         List<SysFile> sysFileList = sysFileService.addFile(sysFile);
         long count = sysFileList.stream().filter(sysFileDTO -> !sysFileDTO.getSuccess()).count();

src/main/java/com/usky/dxtop/service/impl/SysAsyncTaskServiceImpl.java

@@ -42,7 +42,6 @@ public class SysAsyncTaskServiceImpl extends ServiceImpl<SysAsyncTaskMapper, Sys
         sysAsyncTask.setStartTime(new Date());
         sysAsyncTask.setCreateBy(SecurityUtils.getUsername());
         sysAsyncTask.setFuncType(funcType);
-        sysAsyncTask.setResultType(funcType);
         save(sysAsyncTask);
         return sysAsyncTask.getId();
     }

src/main/resources/mapper/TopChannelMapper.xml

@@ -17,7 +17,7 @@
         from top_channel as tc
         left join t_order as o
         on tc.id = o.channel_id
-        where tc.del_flag = 0
+        where tc.del_flag = 0 and (o.order_flag = 4 or o.order_flag = 6)
         group by tc.id
     </select>