java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改提交

Browse Source
This commit is contained in:
liuyihe
2026-09-06 15:02:33 +08:00
parent 42ddc19826
commit 3ae8964fe5
15 changed files with 242 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firstleg/src/main/java/com/baiyue/firstleg/dto/OrderApprovedInboundCommand.java
+4 -4
View File
@@ -34,7 +34,7 @@ public record OrderApprovedInboundCommand(
Integer totalPackageCount,
String pickupMethod,
LocalDateTime requestedPickupAt,
String fulfillmentType
String fulfillmentType, String lxCodes
) {
public OrderApprovedInboundCommand(
long tenantId, long orderId, String orderNo, String inboundCode, Long customerId, String customerName,
@@ -49,7 +49,7 @@ public record OrderApprovedInboundCommand(
deliveryWarehouseId, deliveryWarehouseName, expectedArrivalAt, businessType, channelCode, channelName,
carrierId, carrierName, taxMode, pricingTaxMode, containerMode, customsInspection, destinationType,
destinationWarehouseId, destinationCode, destinationName, publicRemark, expressCompanyName,
expressTrackingNo, totalPackageCount, null, null, "STANDARD");
expressTrackingNo, totalPackageCount, null, null, "STANDARD", null);
}
/** 兼容尚未携带订单总箱数的历史事件。 */
public OrderApprovedInboundCommand(
@@ -64,7 +64,7 @@ public record OrderApprovedInboundCommand(
deliveryWarehouseId, deliveryWarehouseName, expectedArrivalAt, businessType, channelCode, channelName,
carrierId, carrierName, taxMode, pricingTaxMode, containerMode, customsInspection, destinationType,
destinationWarehouseId, destinationCode, destinationName, publicRemark, expressCompanyName,
expressTrackingNo, null, null, null, "STANDARD");
expressTrackingNo, null, null, null, "STANDARD", null);
}
/** 兼容未携带报价包税维度的历史调用方。 */
@@ -80,6 +80,6 @@ public record OrderApprovedInboundCommand(
deliveryWarehouseId, deliveryWarehouseName, expectedArrivalAt, businessType, channelCode, channelName,
carrierId, carrierName, taxMode, null, containerMode, customsInspection, destinationType,
destinationWarehouseId, destinationCode, destinationName, publicRemark, expressCompanyName,
expressTrackingNo, null, null, null, "STANDARD");
expressTrackingNo, null, null, null, "STANDARD", null);
}
}
firstleg/src/main/java/com/baiyue/firstleg/entity/InboundOrderEntity.java
+1
View File
@@ -39,6 +39,7 @@ public class InboundOrderEntity extends BaseEntity {
private String deliveryWarehouseName;
private String businessType;
private String fulfillmentType;
private String lxCodes;
private String channelCode;
private String channelName;
private Long carrierId;
firstleg/src/main/java/com/baiyue/firstleg/service/InboundOrderCreationService.java
+2
View File
@@ -69,6 +69,7 @@ public class InboundOrderCreationService {
inbound.setDeliveryWarehouseName(command.deliveryWarehouseName());
inbound.setBusinessType(command.businessType());
inbound.setFulfillmentType(fulfillmentType(command.fulfillmentType()));
inbound.setLxCodes("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType()) ? command.lxCodes() : null);
inbound.setChannelCode(command.channelCode());
inbound.setChannelName(command.channelName());
inbound.setCarrierId(command.carrierId());
@@ -221,6 +222,7 @@ public class InboundOrderCreationService {
inbound.setDeliveryWarehouseName(command.deliveryWarehouseName());
inbound.setBusinessType(command.businessType());
inbound.setFulfillmentType(fulfillmentType(command.fulfillmentType()));
inbound.setLxCodes("ONE_CLICK_DROPSHIP".equals(inbound.getFulfillmentType()) ? command.lxCodes() : null);
inbound.setChannelCode(command.channelCode());
inbound.setChannelName(command.channelName());
inbound.setCarrierId(command.carrierId());