diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/goofish/GoofishOrderPipeline.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/goofish/GoofishOrderPipeline.java index 0c16f4f..d8ecba8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/goofish/GoofishOrderPipeline.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/goofish/GoofishOrderPipeline.java @@ -543,8 +543,12 @@ public class GoofishOrderPipeline { return; } ShipAddressParts addr = resolveShippingAddressParts(row); - if (StringUtils.isEmpty(addr.shipName) || StringUtils.isEmpty(addr.shipMobile) - || StringUtils.isEmpty(addr.shipAddress)) { + String shipMobile = normalizeShipMobile(addr.shipMobile); + // 虚拟号(11位主号-分机、带空格、700 开头 15 位)过不了开放平台 ^1[3-9]\\d{9}$。 + // 抽不出合法 11 位时不传寄件方,走闲管家后台默认发货地址。 + boolean omitSender = shipMobile == null && StringUtils.isNotEmpty(addr.shipMobile); + if (!omitSender && (StringUtils.isEmpty(addr.shipName) || StringUtils.isEmpty(shipMobile) + || StringUtils.isEmpty(addr.shipAddress))) { patchShipError(row, "缺少收货人/手机/地址:详情无字段时请关联京东单并维护地址,或等平台返回收货字段"); if (goofishOrderChangeLogger != null) { goofishOrderChangeLogger.append(row.getId(), row.getAppKey(), row.getOrderNo(), @@ -557,20 +561,24 @@ public class GoofishOrderPipeline { IERPAccount cred = erpAccountResolver.resolve(row.getAppKey()); OrderShipRequest ship = new OrderShipRequest(cred); ship.setOrderNo(row.getOrderNo()); - ship.setShipName(addr.shipName); - ship.setShipMobile(addr.shipMobile); - ship.setShipAddress(addr.shipAddress); - if (addr.shipDistrictId != null) { - ship.setShipDistrictId(addr.shipDistrictId); - } - if (StringUtils.isNotEmpty(addr.shipProvName)) { - ship.setShipProvName(addr.shipProvName); - } - if (StringUtils.isNotEmpty(addr.shipCityName)) { - ship.setShipCityName(addr.shipCityName); - } - if (StringUtils.isNotEmpty(addr.shipAreaName)) { - ship.setShipAreaName(addr.shipAreaName); + if (omitSender) { + log.info("闲管家发货:号码不是合法手机号,不传寄件方,改用闲管家默认发货地址 orderNo={}", row.getOrderNo()); + } else { + ship.setShipName(addr.shipName); + ship.setShipMobile(shipMobile); + ship.setShipAddress(addr.shipAddress); + if (addr.shipDistrictId != null) { + ship.setShipDistrictId(addr.shipDistrictId); + } + if (StringUtils.isNotEmpty(addr.shipProvName)) { + ship.setShipProvName(addr.shipProvName); + } + if (StringUtils.isNotEmpty(addr.shipCityName)) { + ship.setShipCityName(addr.shipCityName); + } + if (StringUtils.isNotEmpty(addr.shipAreaName)) { + ship.setShipAreaName(addr.shipAreaName); + } } ship.setWaybillNo(waybill.trim()); ship.setExpressCode(expressCode); @@ -816,6 +824,27 @@ public class GoofishOrderPipeline { row.setShipError(m); } + /** + * 开放平台 ship_mobile 只接受 {@code ^1[3-9]\\d{9}$}。 + * 虚拟号里的空格、{@code -分机}、{@code 转}、前缀 86 先去掉,只留 11 位主号;700 开头的 15 位号返回 null。 + */ + static String normalizeShipMobile(String raw) { + if (StringUtils.isEmpty(raw)) { + return null; + } + String digits = raw.replaceAll("\\D", ""); + if (digits.startsWith("86") && digits.length() >= 13) { + String rest = digits.substring(2); + if (rest.length() >= 11 && rest.substring(0, 11).matches("1[3-9]\\d{9}")) { + return rest.substring(0, 11); + } + } + if (digits.length() >= 11 && digits.substring(0, 11).matches("1[3-9]\\d{9}")) { + return digits.substring(0, 11); + } + return null; + } + private static class ShipAddressParts { String shipName; String shipMobile; @@ -983,9 +1012,11 @@ public class GoofishOrderPipeline { } ShipAddressParts ship = resolveShippingAddressParts(row); - vo.setShipReceiverName(ship.shipName); - vo.setShipReceiverMobile(ship.shipMobile); - vo.setShipFullAddress(StringUtils.isNotEmpty(ship.shipAddress) ? ship.shipAddress.trim() : ""); + String normalizedMobile = normalizeShipMobile(ship.shipMobile); + boolean omitSender = normalizedMobile == null && StringUtils.isNotEmpty(ship.shipMobile); + vo.setShipReceiverName(omitSender ? null : ship.shipName); + vo.setShipReceiverMobile(omitSender ? null : normalizedMobile); + vo.setShipFullAddress(omitSender || StringUtils.isEmpty(ship.shipAddress) ? "" : ship.shipAddress.trim()); String nGoofishAddr = normalizeAddrComparable(vo.getGoofishOrderFullAddress()); String nShipAddr = normalizeAddrComparable(vo.getShipFullAddress()); @@ -1017,6 +1048,18 @@ public class GoofishOrderPipeline { } hint.append("与闲鱼订单收件串不完全一致(可能已用京东补全或未刷新详情)"); } + if (omitSender) { + if (hint.length() > 0) { + hint.append(';'); + } + hint.append("收件号码是虚拟号,整理不成 11 位手机号,本次不传寄件方,使用闲管家默认发货地址"); + } else if (StringUtils.isNotEmpty(ship.shipMobile) && !ship.shipMobile.replaceAll("\\D", "").equals(normalizedMobile) + && StringUtils.isNotEmpty(normalizedMobile)) { + if (hint.length() > 0) { + hint.append(';'); + } + hint.append("虚拟号已取前 11 位主号作为寄件手机"); + } if (hint.length() == 0) { hint.append(goofishHasContact || goofishHasAddr ? "可对照下方两项文本核对收件信息" : "暂无闲鱼收件信息,请先刷新详情或关联京东单"); }