修改提交

order/src/main/java/com/baiyue/order/client/FirstlegInboundClient.java

@@ -60,7 +60,7 @@ public interface FirstlegInboundClient {
         Boolean customsInspection, String destinationType, Long destinationWarehouseId,
         String destinationCode, String destinationName, String publicRemark,
         String expressCompanyName, String expressTrackingNo, Integer totalPackageCount,
-        String pickupMethod, LocalDateTime requestedPickupAt, String fulfillmentType
+        String pickupMethod, LocalDateTime requestedPickupAt, String fulfillmentType, String lxCodes
     ) {
     }
 }

order/src/main/java/com/baiyue/order/dto/OrderRequests.java

@@ -76,6 +76,8 @@ public final class OrderRequests {
             @Size(max = 40) @Pattern(regexp = "[A-Za-z0-9._:-]+") String inboundCode,
             @Schema(description = "Fulfillment type; omitted means STANDARD / 履约类型；省略时为普通头程", allowableValues = {"STANDARD", "ONE_CLICK_DROPSHIP"}, defaultValue = "STANDARD")
             @Pattern(regexp = "STANDARD|ONE_CLICK_DROPSHIP") String fulfillmentType,
+            @Schema(description = "Lingxing inbound codes for one-click dropship; multiple values separated by comma, space or newline", maxLength = 1000)
+            @Size(max = 1000) String lxCodes,
             @Schema(description = "Selected customer pickup address ID; required for PICKUP / 已选客户取货地址 ID；PICKUP 时必填")
             @Min(1) Long senderAddressId,
             @Schema(description = "Selected private destination address ID; required for PRIVATE / 已选私人目的仓地址 ID；PRIVATE 时必填")
@@ -96,7 +98,7 @@ public final class OrderRequests {
                 sender, receiver, cargoes, pickupMethod, requestedPickupAt, receivingWarehouseId,
                 receivingWarehouseName, channelCode, channelName, carrierId, carrierName, taxMode,
                 pricingTaxMode, containerMode, customsInspection, destinationType, amazonWarehouseCode,
-                shipmentId, referenceId, inboundCode, fulfillmentType, null, null);
+                shipmentId, referenceId, inboundCode, fulfillmentType, null, null, null);
         }
 
         public SaveRequest(Long customerId, String customerName, String transportMode, String tradeTerm,
@@ -114,7 +116,7 @@ public final class OrderRequests {
                 sender, receiver, cargoes, pickupMethod, requestedPickupAt, receivingWarehouseId,
                 receivingWarehouseName, channelCode, channelName, carrierId, carrierName, taxMode,
                 pricingTaxMode, containerMode, customsInspection, destinationType, amazonWarehouseCode,
-                shipmentId, referenceId, inboundCode, null, null, null);
+                shipmentId, referenceId, inboundCode, null, null, null, null);
         }
 
         public SaveRequest(Long customerId, String customerName, String transportMode, String tradeTerm,
@@ -131,7 +133,7 @@ public final class OrderRequests {
                 sender, receiver, cargoes, pickupMethod, requestedPickupAt, receivingWarehouseId,
                 receivingWarehouseName, channelCode, channelName, carrierId, carrierName, taxMode,
                 pricingTaxMode, containerMode, customsInspection, destinationType, amazonWarehouseCode,
-                shipmentId, referenceId, null, null, null, null);
+                shipmentId, referenceId, null, null, null, null, null);
         }
 
         public SaveRequest(Long customerId, String customerName, String transportMode, String tradeTerm,
@@ -148,7 +150,7 @@ public final class OrderRequests {
                 sender, receiver, cargoes, pickupMethod, null, receivingWarehouseId,
                 receivingWarehouseName, channelCode, channelName, carrierId, carrierName, taxMode,
                 pricingTaxMode, containerMode, customsInspection, destinationType, amazonWarehouseCode,
-                shipmentId, referenceId, null, null, null, null);
+                shipmentId, referenceId, null, null, null, null, null);
         }
 
         @AssertTrue(message = "承运商 ID 和名称必须同时填写或同时留空")

order/src/main/java/com/baiyue/order/entity/OrderEntity.java

@@ -52,6 +52,7 @@ public class OrderEntity extends BaseEntity {
     private Boolean customsInspection;
     private String destinationType;
     private String fulfillmentType;
+    private String lxCodes;
     private String amazonWarehouseCode;
     private String shipmentId;
     private String referenceId;

order/src/main/java/com/baiyue/order/service/OrderApplicationService.java

@@ -488,6 +488,7 @@ public class OrderApplicationService {
         order.setContainerMode(request.containerMode()); order.setCustomsInspection(request.customsInspection());
         order.setDestinationType(request.destinationType());
         order.setFulfillmentType(fulfillmentType(request.fulfillmentType()));
+        order.setLxCodes("ONE_CLICK_DROPSHIP".equals(order.getFulfillmentType()) ? normalizeLxCodes(request.lxCodes()) : null);
         order.setAmazonWarehouseCode("FBA".equals(request.destinationType()) && snapshots.destination() != null
             ? snapshots.destination().warehouse().warehouseCode() : request.amazonWarehouseCode());
         order.setShipmentId(request.shipmentId()); order.setReferenceId(request.referenceId());
@@ -519,6 +520,11 @@ public class OrderApplicationService {
         throw new BizException(ResultCode.VALIDATION_FAILED,
             "履约类型必须为 STANDARD 或 ONE_CLICK_DROPSHIP");
     }
+    private static String normalizeLxCodes(String value) {
+        if (value == null || value.isBlank()) return null;
+        return java.util.Arrays.stream(value.trim().split("[,，\\s]+"))
+            .map(String::trim).filter(item -> !item.isEmpty()).distinct().collect(java.util.stream.Collectors.joining(","));
+    }
     private boolean legacyManualMode() {
         return inboundCodeModeProvider.legacyManual();
     }
@@ -683,7 +689,7 @@ public class OrderApplicationService {
             order.getDestinationWarehouseId(), order.getAmazonWarehouseCode(), order.getDestinationWarehouseName(),
             order.getCustomerRemark(), order.getExpressCompany(), order.getExpressTrackingNo(), totalPackageCount,
             order.getPickupMethod(), order.getRequestedPickupAt(),
-            order.getFulfillmentType() == null ? "STANDARD" : order.getFulfillmentType());
+            order.getFulfillmentType() == null ? "STANDARD" : order.getFulfillmentType(), order.getLxCodes());
     }
     private void prepareDraftInbound(OrderEntity order, OrderRequests.SaveRequest request) {
         FirstlegInboundClient client = firstlegProvider == null ? null : firstlegProvider.getIfAvailable();