feat(跟价多状态): 全量跟价支持勾选多个商品状态,取值以派发落库值为准
原来「按商品状态(全量)」写死在售。现在用户端可勾选 在售/缺少的报价/定价问题 (默认只勾在售),勾几个跑几个,状态清单随循环任务落库并在每次派发子任务时下发。 - 载荷的 mode 与状态清单都取派发上下文(childTaskRequest),不再读界面当前勾选: 循环跑到第 N 轮时用户可能已经改过勾选,用界面值会把没勾的状态跑出去。 - listingStatuses 白名单 Active/PricingIssue/MissingOffer 三值,校验放在 try 之外—— try 里的 catch 会把「不支持的商品状态」改写成「循环任务序列化失败」,那是句假话。 - V159 给 biz_price_track_loop_run 加 listing_statuses_json(可空=本特性之前的行=在售)。 - 状态标识用我们自己的键 MissingOffer,页面真实取值是 OfferMissing(2026-10-17 黄建新 英国站真机实锤),两者不同形是有意的:改键名会断载荷兼容。
This commit is contained in:
+102
@@ -1,13 +1,18 @@
|
||||
package com.nanri.aiimage.modules.pricetrack.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.modules.pricetrack.mapper.PriceTrackLoopRunMapper;
|
||||
import com.nanri.aiimage.modules.pricetrack.model.dto.PriceTrackLoopRunCreateRequest;
|
||||
import com.nanri.aiimage.modules.pricetrack.model.entity.PriceTrackLoopRunEntity;
|
||||
import com.nanri.aiimage.modules.pricetrack.model.vo.PriceTrackLoopRunDispatchVo;
|
||||
import com.nanri.aiimage.modules.pricetrack.model.vo.PriceTrackLoopRunVo;
|
||||
import com.nanri.aiimage.modules.pricetrack.model.vo.PriceTrackMatchShopsVo;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -16,6 +21,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
@@ -315,6 +322,101 @@ class PriceTrackLoopRunServiceTest {
|
||||
assertEquals(0, loop.getResumeAttempt());
|
||||
}
|
||||
|
||||
// ---------- 跟价多状态(2026-10-16):勾选的状态必须落在循环记录上 ----------
|
||||
|
||||
private PriceTrackLoopRunService newLoopService(PriceTrackLoopRunMapper loopRunMapper,
|
||||
FileTaskMapper fileTaskMapper,
|
||||
ObjectMapper objectMapper) {
|
||||
ZiniaoShopSwitchService ziniao = mock(ZiniaoShopSwitchService.class);
|
||||
when(ziniao.normalizeShopName(any())).thenAnswer(call -> call.getArgument(0));
|
||||
return new PriceTrackLoopRunService(loopRunMapper, fileTaskMapper, objectMapper, ziniao);
|
||||
}
|
||||
|
||||
private PriceTrackLoopRunCreateRequest statusModeRequest(List<String> statuses) {
|
||||
PriceTrackLoopRunCreateRequest request = new PriceTrackLoopRunCreateRequest();
|
||||
request.setUserId(1L);
|
||||
request.setStatusMode(true);
|
||||
request.setAsinMode(false);
|
||||
request.setItems(new java.util.ArrayList<>(List.of(shop("魏振峰"))));
|
||||
request.setCountryCodes(new java.util.ArrayList<>(List.of("DE")));
|
||||
request.setExecutionMode("FINITE");
|
||||
request.setTargetRounds(1);
|
||||
request.setListingStatuses(statuses == null ? null : new java.util.ArrayList<>(statuses));
|
||||
return request;
|
||||
}
|
||||
|
||||
@Test
|
||||
void createLoopRunPersistsCheckedListingStatusesTrimmedAndDeduped() {
|
||||
PriceTrackLoopRunMapper loopRunMapper = mock(PriceTrackLoopRunMapper.class);
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
PriceTrackLoopRunService service = newLoopService(loopRunMapper, mock(FileTaskMapper.class), objectMapper);
|
||||
|
||||
service.createLoopRun(statusModeRequest(List.of("Active", " PricingIssue ", "Active", "")));
|
||||
|
||||
ArgumentCaptor<PriceTrackLoopRunEntity> captor = ArgumentCaptor.forClass(PriceTrackLoopRunEntity.class);
|
||||
verify(loopRunMapper).insert(captor.capture());
|
||||
assertEquals("[\"Active\",\"PricingIssue\"]", captor.getValue().getListingStatusesJson(),
|
||||
"勾选清单要去空白、去重后落库——派发每一轮都从这里回读");
|
||||
}
|
||||
|
||||
@Test
|
||||
void createLoopRunRejectsStatusOutsideTheCatalog() {
|
||||
PriceTrackLoopRunMapper loopRunMapper = mock(PriceTrackLoopRunMapper.class);
|
||||
PriceTrackLoopRunService service = newLoopService(loopRunMapper, mock(FileTaskMapper.class), new ObjectMapper());
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.createLoopRun(statusModeRequest(List.of("NotAStatus"))));
|
||||
assertTrue(error.getMessage().contains("NotAStatus"), "报错要点名被拒的取值:" + error.getMessage());
|
||||
verify(loopRunMapper, never()).insert(any(PriceTrackLoopRunEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void createLoopRunWithoutListingStatusesStillSucceedsForOlderWebBundle() {
|
||||
// 后端先于用户端发布时,老界面不会带这个字段:空=按在售跑(客户端默认),不能把建单打挂
|
||||
PriceTrackLoopRunMapper loopRunMapper = mock(PriceTrackLoopRunMapper.class);
|
||||
PriceTrackLoopRunService service = newLoopService(loopRunMapper, mock(FileTaskMapper.class), new ObjectMapper());
|
||||
|
||||
PriceTrackLoopRunVo vo = service.createLoopRun(statusModeRequest(null));
|
||||
|
||||
ArgumentCaptor<PriceTrackLoopRunEntity> captor = ArgumentCaptor.forClass(PriceTrackLoopRunEntity.class);
|
||||
verify(loopRunMapper).insert(captor.capture());
|
||||
assertEquals("[]", captor.getValue().getListingStatusesJson());
|
||||
assertTrue(vo.getListingStatuses().isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
void dispatchNextCarriesPersistedStatusesInsteadOfUiState() throws Exception {
|
||||
// 这一条是"必须落库"的全部理由:载荷由用户端现场拼,页面刷新后本地勾选回到默认
|
||||
// (只有在售),INFINITE 循环的后续轮就会静默少跑「缺少的报价 / 定价问题」。
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
PriceTrackLoopRunMapper loopRunMapper = mock(PriceTrackLoopRunMapper.class);
|
||||
PriceTrackLoopRunService service = newLoopService(loopRunMapper, mock(FileTaskMapper.class), objectMapper);
|
||||
|
||||
PriceTrackLoopRunEntity loop = new PriceTrackLoopRunEntity();
|
||||
loop.setId(900L);
|
||||
loop.setUserId(1L);
|
||||
loop.setStatus("RUNNING");
|
||||
loop.setExecutionMode("FINITE");
|
||||
loop.setTargetRounds(2);
|
||||
loop.setCurrentRound(1);
|
||||
loop.setCurrentShopIndex(0);
|
||||
loop.setStatusMode(true);
|
||||
loop.setAsinMode(false);
|
||||
loop.setStopRequested(false);
|
||||
loop.setActiveTaskId(null);
|
||||
loop.setCountryCodesJson(objectMapper.writeValueAsString(List.of("DE")));
|
||||
loop.setListingStatusesJson(objectMapper.writeValueAsString(List.of("Active", "MissingOffer")));
|
||||
loop.setShopsJson(objectMapper.writeValueAsString(List.of(shop("魏振峰"))));
|
||||
when(loopRunMapper.selectById(900L)).thenReturn(loop);
|
||||
|
||||
PriceTrackLoopRunDispatchVo dispatched = service.dispatchNext(900L, 1L);
|
||||
|
||||
assertEquals(List.of("Active", "MissingOffer"), dispatched.getChildTaskRequest().getListingStatuses(),
|
||||
"子任务派发必须回读循环记录上的状态清单");
|
||||
assertEquals(List.of("Active", "MissingOffer"), dispatched.getLoopRun().getListingStatuses(),
|
||||
"循环 VO 也要回显,界面才显示得出这单在跑哪些状态");
|
||||
}
|
||||
|
||||
private PriceTrackMatchShopsVo.PriceTrackShopQueueItem shop(String name) {
|
||||
PriceTrackMatchShopsVo.PriceTrackShopQueueItem item = new PriceTrackMatchShopsVo.PriceTrackShopQueueItem();
|
||||
item.setShopName(name);
|
||||
|
||||
Reference in New Issue
Block a user