From c6f70a0b1104244ac50883fa6bf8d62615723325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 19 Nov 2026 22:42:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd-collect):=20=E8=B4=A7=E5=8F=B7=E5=88=B7?= =?UTF-8?q?=E5=86=99=E7=9A=84=E5=88=A4=E9=87=8D=E6=AF=94=E8=BE=83=E6=94=B9?= =?UTF-8?q?=20BINARY=EF=BC=8C=E6=B6=88=E9=99=A4=E7=9C=9F=E5=BA=93=201267?= =?UTF-8?q?=20=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99=E6=B7=B7=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 真机 34956 分片回传 500「服务器内部错误」,而 8 个商品其实已经 upsert 落库 (synced_at 有刷新)——卡在落库后的货号刷写这一句: item_num != CONVERT(id, CHAR) 两侧都是 IMPLICIT 可强制的字符串, CONVERT 取的是连接排序规则(库默认 utf8mb4_0900_ai_ci),item_num 列是建表时的 utf8mb4_unicode_ci ⇒ MySQL 报 1267 Illegal mix of collations for '<>',整批分片失败。 判据必须与排序规则无关:按字节比较(BINARY),不做任何 collation 协商。 真库对撞(A 机 java-server 账号,事务回滚):旧谓词 ERROR 1267 / 新谓词 touched=8, 回滚后货号仍为原值。 JdProductMapperSqlTest 用真 XMLMapperBuilder 渲染 BoundSql 钉形状:摘掉 BINARY 或改用 COLLATE 即红。 --- .../resources/mapper/jd/JdProductMapper.xml | 9 ++- .../jd/mapper/JdProductMapperSqlTest.java | 77 +++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 backend-java/src/test/java/com/nanri/aiimage/modules/jd/mapper/JdProductMapperSqlTest.java diff --git a/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml b/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml index 2d0f6c6b5..c4a43ac22 100644 --- a/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml +++ b/backend-java/src/main/resources/mapper/jd/JdProductMapper.xml @@ -74,7 +74,14 @@ WHERE company_id = #{companyId} AND task_id = #{taskId} AND manual_locked = 0 - AND (item_num IS NULL OR item_num = '' OR item_num != CONVERT(id, CHAR)) + + AND (item_num IS NULL OR item_num = '' OR BINARY item_num != BINARY CONVERT(id, CHAR))