From ff7e1190730db00bb752f34e63000bf141b075d9 Mon Sep 17 00:00:00 2001 From: API Changelog Bot Date: Mon, 10 Aug 2026 15:38:48 +0800 Subject: [PATCH] =?UTF-8?q?changelog(v2):=20#5788=20=E6=8D=A2=E7=89=88?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E6=B4=BE=E5=8D=95=E5=8F=AF=E6=94=B9=E6=B4=BE?= =?UTF-8?q?+vehicleSlots=20=E6=A0=87=E6=97=A7=E5=AD=97=E6=AE=B5(PR=20#5796?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...¿ç•™æ´¾å•坿”¹æ´¾ä¸Žæ§½ä½æ ‡æ—§-修改接å£-管ç†åŽå°.md | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 changelogs-v2/2026-08/10_5788_æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ä¸Žæ§½ä½æ ‡æ—§-修改接å£-管ç†åŽå°.md diff --git a/changelogs-v2/2026-08/10_5788_æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ä¸Žæ§½ä½æ ‡æ—§-修改接å£-管ç†åŽå°.md b/changelogs-v2/2026-08/10_5788_æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ä¸Žæ§½ä½æ ‡æ—§-修改接å£-管ç†åŽå°.md new file mode 100644 index 0000000..8a1b459 --- /dev/null +++ b/changelogs-v2/2026-08/10_5788_æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ä¸Žæ§½ä½æ ‡æ—§-修改接å£-管ç†åŽå°.md @@ -0,0 +1,74 @@ +--- +schema: "hl-changelog/v2" +ticket: "5788" +title: "æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ï¼šå€™é€‰æŽ’除放行 superseded 行 + vehicleSlots 新增标旧字段" +consumer: "admin" +author: "wx(GIT)" +change_type: "修改接å£" +backend_status: "deployed" +gateway_status: "not_required" +frontend_status: "pending" +frontend_owner: "mmg" +frontend_ref: "" +target_release: "" +verified_at: "2026-08-10" +status_note: "åŽç«¯å·²éƒ¨ç½²æµ‹è¯•æœå¹¶æŒ‰ 26-9313 实测通过。å‰ç«¯éœ€æ¶ˆè´¹ vehicleSlots 新增 superseded 标识渲染「旧数æ®ã€æ ·å¼,并放开ä¿ç•™è¡Œçš„æ”¹æ´¾å…¥å£(候选请求å¯ä¸ä¼  fleetItemIndex)。" +updated_at: "2026-08-10" +base: "dev-v3" +--- + +# 车务: 需求æ¢ç‰ˆä¿ç•™æ´¾å•坿”¹æ´¾ + æ§½ä½è§†å›¾æ ‡æ—§ï¼ˆ#5788) + +> **æœåŠ¡**: hl-fleet-service (8087/8187) +> **PR**: #5796 +> **Issue**: #5788 +> **日期**: 2026-08-10 +> **å½±å“范围**: æ´¾å•看æ¿è®¢å•详情 vehicleSlots 结构(新增 3 字段)ã€æ´¾å•候选查询排除校验语义 +> **背景**: #5784 æ¢ç‰ˆä¿ç•™è¡Œæ­¤å‰ç‚¹ã€Œé‡æ–°é…置车辆ã€å¿…æŠ¥ã€Œå‚æ•°éžæ³•: 排除派å•ä¸å±žäºŽå½“å‰è®¢å•ã€å½“å‰ç”¨è½¦éœ€æ±‚或当å‰è½¦åž‹é¡¹ã€(26-9313 实测),改派通路被拦死;且槽ä½è§†å›¾æ— æ³•区分新旧行。 + +--- + +## 1. è¯¦æƒ…æŽ¥å£ vehicleSlots 新增 3 字段 + +`GET /admin/fleet/board/orders/{orderId}` çš„ `vehicleSlots[]` æ¯è¡Œæ–°å¢ž: + +| 字段 | 类型 | 说明 | +|------|------|------| +| `requirementId` | string(Long) | æ§½ä½è¡Œæ‰€å±žç”¨è½¦éœ€æ±‚ID;与顶层 requirementId ä¸ç­‰ä¸” superseded=true 时为æ¢ç‰ˆä¿ç•™çš„æ—§éœ€æ±‚行 | +| `superseded` | boolean | **æ˜¯å¦æ¢ç‰ˆä¿ç•™çš„æ—§æ´¾å•行**。true=æ—§æ•°æ®,ä»…ä¾›äººå·¥æ ¸å¯¹åŽæ”¹æ´¾/å–æ¶ˆ,ä¸å‚ä¸Žå½“å‰æ–¹æ¡ˆæ—¥æ ¼è¿›åº¦ä¸Žè½¦è´¹è®¡æ•° | +| `supersededByRequirementId` | string(Long) | å–代该行的新需求ID;superseded=true æ—¶éžç©º | + +**排åºçº¦å®š**: 当å‰éœ€æ±‚æ§½ä½è¡Œåœ¨å‰(顺åºä¸å˜),æ¢ç‰ˆä¿ç•™è¡Œè¿½åŠ åœ¨å°¾éƒ¨ã€‚ä¿ç•™è¡Œå›ºå®š `canDelete=false`,`deleteBlockReason="需求已改版ä¿ç•™è¡Œï¼Œè¯·æ”¹æ´¾æˆ–å–æ¶ˆï¼Œä¸æ”¯æŒç›´æŽ¥åˆ é™¤æ§½ä½"`。 + +**å‰ç«¯è¦åš**: ä¿ç•™è¡Œæ¸²æŸ“「旧数æ®/éœ€æ±‚å·²æ”¹ç‰ˆã€æ ‡è¯†(åŒºåˆ«äºŽå½“å‰æ§½ä½),æ“作åªç•™ã€Œæ”¹æ´¾ / å–æ¶ˆã€;顶部黄æ¡(supersededAssignments)ä¿æŒçŽ°çŠ¶ä½œæé†’å…¥å£ã€‚注æ„ä¿ç•™è¡Œçš„ `fleetItemIndex` 是旧版展开åº,å¯èƒ½ä¸Žå½“å‰éœ€æ±‚æ§½ä½æ’žå·,**渲染分组请以 superseded 标志区分,å‹¿å†å•é  fleetItemIndex**。 + +## 2. 候选查询排除校验放宽(ä¿ç•™è¡Œæ”¹æ´¾å…¥å£æ‰“通) + +`POST /admin/fleet/assignments/candidates`: + +- `excludeAssignmentId` 现在å…许两类:①当å‰éœ€æ±‚本身的派å•(原å£å¾„,ä»é¡» requirementId+fleetItemIndex 精确匹é…);â‘¡**æ¢ç‰ˆä¿ç•™æ´¾å•**(supersededByRequirementId éžç©º,属当å‰è®¢å•å³å¯)。 +- **排除ä¿ç•™è¡Œæ—¶ `fleetItemIndex` å¯ä¸ä¼ **(旧版åºå·åœ¨æ–°éœ€æ±‚下无语义,åŽç«¯ä¸å†æ ¡éªŒ);座ä½åŒ¹é…自动锚ä¿ç•™è¡Œè‡ªèº«åº§ä½å¿«ç…§(requiredSeats),ä¸å†æŒ‰æ–°éœ€æ±‚车型项定ä½ã€‚ +- ä¿ç•™è¡Œè‡ªèº«å ç”¨ä¼šè¢«æ­£ç¡®æŽ’除:实测 exclude åŽåŽŸè½¦ available=trueã€conflicts=[](坿”¹å›žåŽŸè½¦æˆ–æ¢è½¦)。 +- 防护ä¸å›žå½’:éžæœ¬è®¢å•/ä¸å­˜åœ¨çš„ assignmentIdã€æ™®é€šè¡Œ fleetItemIndex ä¸åŒ¹é… → ä»æŠ¥ã€Œå‚æ•°éžæ³•ã€ã€‚ + +## 3. å®žæµ‹æ•°æ®æ ·ä¾‹(æµ‹è¯•æœ 26-9313) + +```json +// vehicleSlots 尾部ä¿ç•™è¡Œ +{"fleetItemIndex":1, "requiredVehicleType":"mpv", "slotStatus":"assigned", + "vehiclePlate":"è’™A-S6666", "superseded":true, + "requirementId":"2086270153913225218", + "supersededByRequirementId":"2086700635972915201", + "canDelete":false, "deleteBlockReason":"需求已改版ä¿ç•™è¡Œï¼Œè¯·æ”¹æ´¾æˆ–å–æ¶ˆï¼Œä¸æ”¯æŒç›´æŽ¥åˆ é™¤æ§½ä½"} +``` + +## å…³è” / è”系人 + +### 链接 + +- **相关工å•**: [#5788](https://git.1814.love:8443/wx/HL/issues/5788)ã€[#5784](https://git.1814.love:8443/wx/HL/issues/5784)(æ¢ç‰ˆä¿ç•™è§„则) + +### è”系人 + +- **åŽç«¯è´Ÿè´£äºº**: @wx +- **å‰ç«¯è´Ÿè´£äºº**: @mmg