style(产品风险): 合并段注释与日志实参收成行内,压回服务侧增量

代收基线走 ops 仓那一笔。实测 1485→1492 行。
This commit is contained in:
2026-10-19 20:42:33 +08:00
parent f1dc1b9d1f
commit d44ac2c447
@@ -647,9 +647,7 @@ public class ProductRiskTaskService {
shopDone,
mergedRows,
mergedPayload.getCountries() == null ? 0 : mergedPayload.getCountries().size(),
mergedPayload.getShopDone(),
mergedPayload.getListingFilter(),
mergedPayload.getWarning());
mergedPayload.getShopDone(), mergedPayload.getListingFilter(), mergedPayload.getWarning());
if (incomingShopDone && mergedRows <= 0) {
markResultNoData(fr, "没有数据");
productRiskTaskCacheService.removeShopMergedPayload(taskId, shopKey);
@@ -1260,8 +1258,7 @@ public class ProductRiskTaskService {
if (incoming.getError() != null && !incoming.getError().isBlank()) {
merged.setError(incoming.getError());
}
// 审计留痕两字段按「后到的非空值覆盖」:客户端只在店铺收尾那一次带全量值,
// 中途增量回传不带它们(见 app_client/amazon/approve.py 的 _shop_payload)
// 审计留痕两字段按「后到的非空值覆盖」:客户端只在店铺收尾那一次带全量值
if (incoming.getListingFilter() != null && !incoming.getListingFilter().isBlank()) {
merged.setListingFilter(incoming.getListingFilter().trim());
}