{{ trademarkPanelRef.queryStatus === 'done' ? '筛查已完成' : '数据筛查失败' }}
-
{{ trademarkPanelRef.queryStatus === 'done' ? '点击"导出数据"按钮，可导出为 Excel 表格文件。' : (trademarkPanelRef.errorMessage || '请稍后重试') }}
+
{{ trademarkPanelRef.queryStatus === 'done' ? '点击右侧“导出数据”按钮，可导出为 Excel 表格文档。如过滤结果为 0，请排查选品表格内容是否正确；产品所属地区与商标查询地区是否不一致，如不一致可能导致筛查结果偏差或错误。' : (trademarkPanelRef.errorMessage || '请稍后重试') }}
新建任务
@@ -328,7 +328,7 @@ function handleExportData() {
{{ trademarkPanelRef?.taskProgress?.product?.label || '未注册/TM商标筛查' }}
-
{{ trademarkPanelRef?.taskProgress?.product?.desc || '筛查未注册商标或TM标的产品' }} (已完成)
+
{{ trademarkPanelRef?.taskProgress?.product?.desc || '筛查未注册商标或TM标的产品' }} (已完成)
@@ -340,15 +340,15 @@ function handleExportData() {
查询数量
- {{ (trademarkPanelRef?.taskProgress?.product?.total || 0) > 0 ? trademarkPanelRef.taskProgress.product.total : '-' }}
+ {{ trademarkPanelRef?.isProductTaskRealData ? trademarkPanelRef.taskProgress.product.total : '-' }}
未注册/TM标
- {{ (trademarkPanelRef?.taskProgress?.product?.total || 0) > 0 && (trademarkPanelRef?.taskProgress?.product?.current || 0) >= trademarkPanelRef.taskProgress.product.total ? (trademarkPanelRef?.taskProgress?.product?.completed || 0) : '-' }}
+ {{ trademarkPanelRef?.isProductTaskRealData ? trademarkPanelRef.taskProgress.product.completed : '-' }}
已过滤
- {{ (trademarkPanelRef?.taskProgress?.product?.total || 0) > 0 && (trademarkPanelRef?.taskProgress?.product?.current || 0) >= trademarkPanelRef.taskProgress.product.total ? ((trademarkPanelRef?.taskProgress?.product?.total || 0) - (trademarkPanelRef?.taskProgress?.product?.completed || 0)) : '-' }}
+ {{ trademarkPanelRef?.isProductTaskRealData ? (trademarkPanelRef.taskProgress.product.total - trademarkPanelRef.taskProgress.product.completed) : '-' }}
@@ -357,7 +357,7 @@ function handleExportData() {
{{ trademarkPanelRef?.taskProgress?.brand?.label || '品牌商标筛查' }}
-
{{ trademarkPanelRef?.taskProgress?.brand?.desc || '筛查未注册商标的品牌' }} (已完成)
+
{{ trademarkPanelRef?.taskProgress?.brand?.desc || '筛查未注册商标的品牌' }} (已完成)
@@ -369,15 +369,15 @@ function handleExportData() {
查询数量
- {{ (trademarkPanelRef?.taskProgress?.brand?.total || 0) === 0 ? '-' : trademarkPanelRef.taskProgress.brand.total }}
+ {{ trademarkPanelRef?.isBrandTaskRealData ? trademarkPanelRef.taskProgress.brand.total : '-' }}
未注册
- {{ ((trademarkPanelRef?.taskProgress?.brand?.current || 0) >= (trademarkPanelRef?.taskProgress?.brand?.total || 1)) ? (trademarkPanelRef?.taskProgress?.brand?.completed || 0) : '-' }}
+ {{ trademarkPanelRef?.isBrandTaskRealData ? trademarkPanelRef.taskProgress.brand.completed : '-' }}
已注册
- {{ ((trademarkPanelRef?.taskProgress?.brand?.current || 0) >= (trademarkPanelRef?.taskProgress?.brand?.total || 1)) ? ((trademarkPanelRef?.taskProgress?.brand?.total || 0) - (trademarkPanelRef?.taskProgress?.brand?.completed || 0)) : '-' }}
+ {{ trademarkPanelRef?.isBrandTaskRealData ? (trademarkPanelRef.taskProgress.brand.total - trademarkPanelRef.taskProgress.brand.completed) : '-' }}
diff --git a/electron-vue-template/src/renderer/components/amazon/TrademarkCheckPanel.vue b/electron-vue-template/src/renderer/components/amazon/TrademarkCheckPanel.vue
index f78fd6c..2efe0f9 100644
--- a/electron-vue-template/src/renderer/components/amazon/TrademarkCheckPanel.vue
+++ b/electron-vue-template/src/renderer/components/amazon/TrademarkCheckPanel.vue
@@ -4,6 +4,7 @@ import { ElMessage } from 'element-plus'
import { handlePlatformFileExport } from '../../utils/settings'
import { getUsernameFromToken } from '../../utils/token'
import { markApi } from '../../api/mark'
+import { useFileDrop } from '../../composables/useFileDrop'
const TrialExpiredDialog = defineAsyncComponent(() => import('../common/TrialExpiredDialog.vue'))
const refreshVipStatus = inject<() => Promise
>('refreshVipStatus')
@@ -31,6 +32,10 @@ const totalSteps = ref(0)
let brandProgressTimer: any = null
const brandTaskId = ref('')
+// 真实数据标记（区分临时进度值和真实统计数据）
+const isProductTaskRealData = ref(false)
+const isBrandTaskRealData = ref(false)
+
// 三个任务的进度数据
const taskProgress = ref({
product: { total: 0, current: 0, completed: 0, label: '产品商标筛查', desc: '筛查未注册商标或TM标的商品' },
@@ -107,6 +112,49 @@ function showMessage(message: string, type: 'success' | 'warning' | 'error' | 'i
ElMessage({ message, type })
}
+// 拖拽上传
+async function processTrademarkFile(file: File) {
+ uploadLoading.value = true
+
+ try {
+ // 根据选中的查询类型确定需要的表头
+ const requiredHeaders: string[] = []
+ if (queryTypes.value.includes('product')) {
+ requiredHeaders.push('商品主图')
+ }
+ if (queryTypes.value.includes('brand')) {
+ requiredHeaders.push('品牌')
+ }
+
+ // 验证表头
+ if (requiredHeaders.length > 0) {
+ const validateResult = await markApi.validateHeaders(file, requiredHeaders)
+ if (validateResult.code !== 200 && validateResult.code !== 0) {
+ showMessage(validateResult.msg || '表头验证失败', 'error')
+ return
+ }
+ }
+
+ trademarkFileName.value = file.name
+ trademarkFile.value = file
+ queryStatus.value = 'idle'
+ trademarkData.value = []
+ trademarkFullData.value = []
+ trademarkHeaders.value = []
+ emit('updateData', [])
+ } catch (error: any) {
+ showMessage('表头验证失败: ' + error.message, 'error')
+ } finally {
+ uploadLoading.value = false
+ }
+}
+
+const { dragActive, onDragEnter, onDragOver, onDragLeave, onDrop } = useFileDrop({
+ accept: /\.xlsx?$/i,
+ onFile: processTrademarkFile,
+ onError: (msg) => showMessage(msg, 'warning')
+})
+
function removeTrademarkFile() {
trademarkFileName.value = ''
trademarkFile.value = null
@@ -196,41 +244,8 @@ async function handleTrademarkUpload(e: Event) {
return
}
- uploadLoading.value = true
-
- try {
- // 根据选中的查询类型确定需要的表头
- const requiredHeaders: string[] = []
- if (queryTypes.value.includes('product')) {
- requiredHeaders.push('商品主图')
- }
- if (queryTypes.value.includes('brand')) {
- requiredHeaders.push('品牌')
- }
-
- // 验证表头
- if (requiredHeaders.length > 0) {
- const validateResult = await markApi.validateHeaders(file, requiredHeaders)
- if (validateResult.code !== 200 && validateResult.code !== 0) {
- showMessage(validateResult.msg || '表头验证失败', 'error')
- input.value = ''
- return
- }
- }
-
- trademarkFileName.value = file.name
- trademarkFile.value = file
- queryStatus.value = 'idle'
- trademarkData.value = []
- trademarkFullData.value = []
- trademarkHeaders.value = []
- emit('updateData', [])
- } catch (error: any) {
- showMessage('表头验证失败: ' + error.message, 'error')
- } finally {
- uploadLoading.value = false
- input.value = ''
- }
+ await processTrademarkFile(file)
+ input.value = ''
}
async function startTrademarkQuery() {
@@ -268,6 +283,10 @@ async function startTrademarkQuery() {
taskProgress.value.platform.current = 0
taskProgress.value.platform.completed = 0
+ // 重置真实数据标记
+ isProductTaskRealData.value = false
+ isBrandTaskRealData.value = false
+
// 通知父组件更新数据
emit('updateData', [])
@@ -297,7 +316,7 @@ async function startTrademarkQuery() {
// 轮询检查任务状态
const pollTask = async () => {
const maxWaitTime = 60000
- const pollInterval = 3000
+ const pollInterval = 2000
const startTime = Date.now()
let taskResult: any = null
@@ -307,7 +326,16 @@ async function startTrademarkQuery() {
return null
}
- await new Promise(resolve => setTimeout(resolve, pollInterval))
+ // 分段等待，每500ms检查一次取消状态
+ const waitSegments = pollInterval / 500
+ for (let i = 0; i < waitSegments; i++) {
+ if (!trademarkLoading.value) {
+ clearInterval(progressTimer)
+ return null
+ }
+ await new Promise(resolve => setTimeout(resolve, 500))
+ }
+
if (!trademarkLoading.value) {
clearInterval(progressTimer)
return null
@@ -321,8 +349,14 @@ async function startTrademarkQuery() {
return taskResult
}
}
- } catch (err) {
- // 继续等待
+ } catch (err: any) {
+ const errorMsg = err.message || ''
+ if (errorMsg.includes('表格没有数据') || errorMsg.includes('没有数据') ||
+ errorMsg.includes('任务处理失败') || errorMsg.includes('任务失败')) {
+ clearInterval(progressTimer)
+ throw err
+ }
+ // 其他错误（网络错误等）继续等待
}
}
@@ -333,7 +367,12 @@ async function startTrademarkQuery() {
try {
productResult = await pollTask()
- if (!productResult || (productResult.code !== 200 && productResult.code !== 0)) {
+ // 如果返回null，说明用户取消了，直接返回
+ if (!productResult) {
+ return
+ }
+
+ if (productResult.code !== 200 && productResult.code !== 0) {
throw new Error('获取任务超时或失败，请重试')
}
@@ -345,6 +384,7 @@ async function startTrademarkQuery() {
taskData.total = productResult.data.original?.total || 0
taskData.current = taskData.total
taskData.completed = productResult.data.filtered.length
+ isProductTaskRealData.value = true
} finally {
clearInterval(progressTimer)
}
@@ -440,6 +480,7 @@ async function startTrademarkQuery() {
brandData.total = brandResult.data.checked || brandResult.data.total || brandData.total
brandData.current = brandData.total
brandData.completed = brandResult.data.unregistered || 0
+ isBrandTaskRealData.value = true
// 提取未注册品牌列表
const unregisteredBrands = brandResult.data.data.map((item: any) => item.brand).filter(Boolean)
@@ -455,6 +496,7 @@ async function startTrademarkQuery() {
// 更新统计：显示过滤出的实际行数（而不是品牌数）
brandData.completed = filterResult.data.filteredRows.length
+ isBrandTaskRealData.value = true
// 将品牌筛查结果作为展示数据
const brandItems = filterResult.data.filteredRows.map((row: any) => ({
@@ -484,44 +526,61 @@ async function startTrademarkQuery() {
}
// 只要流程正常完成，就设置为done状态（不再依赖trademarkLoading）
- queryStatus.value = 'done'
- emit('updateData', trademarkData.value)
-
- let summaryMsg = '筛查完成'
- if (needProductCheck) summaryMsg += `，产品：${taskProgress.value.product.completed}/${taskProgress.value.product.total}`
- if (needBrandCheck && brandList.length > 0) summaryMsg += `，品牌：${taskProgress.value.brand.completed}/${taskProgress.value.brand.total}`
- showMessage(summaryMsg, 'success')
-
- // 保存会话
- await saveSession()
+ queryStatus.value = 'done'
+ emit('updateData', trademarkData.value)
+
+ let summaryMsg = '筛查完成'
+ if (needProductCheck) summaryMsg += `，产品：${taskProgress.value.product.completed}/${taskProgress.value.product.total}`
+ if (needBrandCheck && brandList.length > 0) summaryMsg += `，品牌：${taskProgress.value.brand.completed}/${taskProgress.value.brand.total}`
+ showMessage(summaryMsg, 'success')
+
+ // 保存会话
+ await saveSession()
} catch (error: any) {
- const hasProductData = taskProgress.value.product.total > 0
+ const hasProductData = isProductTaskRealData.value && taskProgress.value.product.total > 0
+ const hasBrandData = isBrandTaskRealData.value && taskProgress.value.brand.total > 0
// 优化错误信息 - 只显示友好提示
let msg = error.message || ''
- if (msg.includes('网络') || msg.includes('network')) {
+ let friendlyMsg = ''
+
+ if (msg.includes('网络') || msg.includes('network') || msg.includes('Network')) {
queryStatus.value = 'networkError'
- errorMessage.value = '网络不可用，请检查你的网络或代理设置'
- } else if (msg.includes('超时') || msg.includes('timeout')) {
+ friendlyMsg = '网络连接失败，请检查网络或代理设置'
+ } else if (msg.includes('超时') || msg.includes('timeout') || msg.includes('Timeout')) {
queryStatus.value = 'error'
- errorMessage.value = '数据库维护中，请稍后重试'
+ friendlyMsg = '查询超时，请稍后重试'
} else if (msg.includes('403') || msg.includes('风控')) {
queryStatus.value = 'error'
- errorMessage.value = '网站风控限制，请稍后重试'
+ friendlyMsg = '访问受限，请稍后重试'
+ } else if (msg.includes('表格没有数据') || msg.includes('没有数据')) {
+ queryStatus.value = 'error'
+ friendlyMsg = '表格没有有效数据，请检查文件内容'
+ } else if (msg.includes('创建任务失败') || msg.includes('提取品牌')) {
+ queryStatus.value = 'error'
+ friendlyMsg = '数据处理失败，请检查文件格式是否正确'
} else {
queryStatus.value = 'error'
- errorMessage.value = '数据库维护中，请稍后重试'
+ friendlyMsg = '查询失败，请稍后重试'
}
- // 仅在第1步失败时清空数据
- if (!hasProductData) {
+ // 根据失败阶段确定错误提示
+ if (hasProductData && !hasBrandData && needBrandCheck) {
+ // 产品筛查完成，品牌筛查失败
+ errorMessage.value = `品牌筛查失败：${friendlyMsg}。产品筛查结果已保留`
+ // 保留产品数据
+ emit('updateData', trademarkData.value)
+ } else if (!hasProductData) {
+ errorMessage.value = `产品筛查失败：${friendlyMsg}`
trademarkData.value = []
trademarkFullData.value = []
trademarkHeaders.value = []
emit('updateData', [])
} else {
+ errorMessage.value = friendlyMsg
emit('updateData', trademarkData.value)
}
+
showMessage(errorMessage.value, 'error')
} finally {
// 清除定时器
@@ -646,6 +705,10 @@ function resetToIdle() {
taskProgress.value.platform.current = 0
taskProgress.value.platform.completed = 0
+ // 重置真实数据标记
+ isProductTaskRealData.value = false
+ isBrandTaskRealData.value = false
+
// 清空localStorage中的会话数据
try {
const username = getUsernameFromToken()
@@ -666,7 +729,9 @@ defineExpose({
resetToIdle,
stopTrademarkQuery,
startTrademarkQuery,
- exportTrademarkData
+ exportTrademarkData,
+ isProductTaskRealData,
+ isBrandTaskRealData
})
@@ -679,7 +744,15 @@ defineExpose({
产品筛查：需导入卖家精灵选品表格，并勾选"导出主图"；品牌筛查：Excel需包含"品牌"列
-
+
📤
⟳
{{ uploadLoading ? '正在验证表头...' : '点击或将文件拖拽到这里上传' }}
@@ -845,6 +918,7 @@ defineExpose({
.dropzone:hover { background: #f6fbff; border-color: #409EFF; }
.dropzone.uploading { cursor: not-allowed; opacity: 0.7; }
.dropzone.uploading:hover { background: #fafafa; border-color: #c0c4cc; }
+.dropzone.drag-active { background: #e6f4ff; border-color: #1677FF; }
.dz-icon { font-size: 20px; margin-bottom: 6px; color: #909399; }
.dz-text { color: #303133; font-size: 13px; margin-bottom: 2px; }
.dz-sub { color: #909399; font-size: 12px; }
diff --git a/erp_client_sb/pom.xml b/erp_client_sb/pom.xml
index 77cab20..63c83bb 100644
--- a/erp_client_sb/pom.xml
+++ b/erp_client_sb/pom.xml
@@ -10,7 +10,7 @@
com.tashow.erp
erp_client_sb
-
2.6.0
+
2.6.2
erp_client_sb
erp客户端
diff --git a/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java b/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java
index 6777fde..bc87519 100644
--- a/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java
+++ b/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java
@@ -58,10 +58,10 @@ public class TrademarkController {
String taskId = (String) request.get("taskId");
try {
+ // 保持与前端传入数量一致，不去重（允许重复品牌以匹配产品数量）
List list = brands.stream()
.filter(b -> b != null && !b.trim().isEmpty())
.map(String::trim)
- .distinct()
.collect(Collectors.toList());
long start = System.currentTimeMillis();
@@ -122,8 +122,8 @@ public class TrademarkController {
}
long t = (System.currentTimeMillis() - start) / 1000;
- int checkedCount = allResults.size();
- int failedCount = list.size() - checkedCount;
+ int checkedCount = list.size();
+ int failedCount = 0;
Map res = new HashMap<>();
res.put("total", list.size());
diff --git a/erp_client_sb/src/main/java/com/tashow/erp/service/impl/FangzhouApiServiceImpl.java b/erp_client_sb/src/main/java/com/tashow/erp/service/impl/FangzhouApiServiceImpl.java
index 0bfebaa..4f5328d 100644
--- a/erp_client_sb/src/main/java/com/tashow/erp/service/impl/FangzhouApiServiceImpl.java
+++ b/erp_client_sb/src/main/java/com/tashow/erp/service/impl/FangzhouApiServiceImpl.java
@@ -163,8 +163,17 @@ public class FangzhouApiServiceImpl implements IFangzhouApiService {
for (int i = 0; i < maxRetries; i++) {
JsonNode json = callApi("TaskPageList", data, token);
JsonNode dNode = json.get("D").get("items").get(0);
- String downloadUrl = dNode.get("download_url").asText();
+ // 检查任务状态
+ int state = dNode.get("state").asInt();
+ if (state == -1) {
+ String remark = dNode.has("remark") ? dNode.get("remark").asText() : "任务处理失败";
+ logger.error("任务处理失败: {}", remark);
+ throw new RuntimeException(remark);
+ }
+
+ // 检查下载链接
+ String downloadUrl = dNode.get("download_url").asText();
if (downloadUrl != null && !downloadUrl.isEmpty()) {
return dNode;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MarkServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MarkServiceImpl.java
index 5853576..63d1ce7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MarkServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/MarkServiceImpl.java
@@ -57,6 +57,8 @@ public class MarkServiceImpl implements IMarkService {
accountData.put("password", password);
accountData.put("token", token);
redisCache.setCacheMap(CacheConstants.MARK_ACCOUNT_KEY, accountData);
+ // 设置 6 天后过期
+ redisCache.expire(CacheConstants.MARK_ACCOUNT_KEY, 6, java.util.concurrent.TimeUnit.DAYS);
return token;
}
throw new RuntimeException("注册失败: " + json.get("M").asText());
@@ -84,7 +86,10 @@ public class MarkServiceImpl implements IMarkService {
String result = restTemplate.postForObject("https://api.fangzhoujingxuan.com/App", requestEntity, String.class);
JsonNode json = objectMapper.readTree( result);
String token = json.get("D").get("key").asText();
- if( token !=null)redisCache.setCacheMapValue(CacheConstants.MARK_ACCOUNT_KEY, "token",token);
+ if( token !=null){
+ redisCache.setCacheMapValue(CacheConstants.MARK_ACCOUNT_KEY, "token",token);
+ redisCache.expire(CacheConstants.MARK_ACCOUNT_KEY, 6, java.util.concurrent.TimeUnit.DAYS);
+ }
return token;
} catch (JsonProcessingException e) {
throw new RuntimeException(e);