|
|
@@ -73,6 +73,7 @@ import java.util.concurrent.Executors;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import static com.yami.shop.common.util.HttpUtil.post;
|
|
|
+import static com.yami.shop.wx.utils.Http5Util.post;
|
|
|
|
|
|
@Slf4j
|
|
|
@Service
|
|
|
@@ -1446,9 +1447,9 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
|
|
|
exportTask.setUserId(userId);
|
|
|
exportTask.setExportStatus(0); // 待处理
|
|
|
exportTask.setTaskId(taskId);
|
|
|
- exportTask.setExportType(2);//瀵煎嚭绫诲瀷
|
|
|
+ exportTask.setExportType(2);
|
|
|
exportTask.setTaskName("售后订单导出");
|
|
|
- exportTask.setExportMsg("导出失败," + e.getMessage());
|
|
|
+ exportTask.setExportMsg("导出失败");
|
|
|
exportTask.setCreateTime(new Date());
|
|
|
exportTask.setUpdateTime(new Date());
|
|
|
exportTaskService.save(exportTask);
|
|
|
@@ -1534,13 +1535,13 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
|
|
|
if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
|
|
|
log.info("导出任务被中断");
|
|
|
exportTask.setExportStatus(3); // 已中断
|
|
|
- exportTask.setExportMsg("导出失败," + e.getMessage());
|
|
|
+ exportTask.setExportMsg("导出失败");
|
|
|
exportTaskService.updateById(exportTask);
|
|
|
return;
|
|
|
}
|
|
|
log.info("导出任务成功");
|
|
|
exportTask.setExportStatus(1);
|
|
|
- exportTask.setExportMsg("导出失败," + e.getMessage());
|
|
|
+ exportTask.setExportMsg("导出失败");
|
|
|
exportTask.setUpdateTime(new Date());
|
|
|
exportTaskService.updateById(exportTask);
|
|
|
} catch (InterruptedException e) {
|