优化

firstleg/src/main/java/com/baiyue/firstleg/BaiyueFirstlegApplication.java

@@ -18,7 +18,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         "com.baiyue.firstleg.outbound.dispatch.mapper",
         "com.baiyue.firstleg.portschedule.mapper",
         "com.baiyue.firstleg.customs.mapper",
-        "com.baiyue.firstleg.customerstatistics.adapter.out.persistence"
+        "com.baiyue.firstleg.customerstatistics.adapter.out.persistence",
+        "com.baiyue.firstleg.pricebookquery.adapter.out.persistence"
 })
 @EnableFeignClients(basePackages = "com.baiyue.firstleg")
 @EnableScheduling

firstleg/src/main/java/com/baiyue/firstleg/oceanbooking/service/OceanBookingService.java

@@ -11,9 +11,9 @@ import com.baiyue.firstleg.domain.ContainerSpecificationCatalog;
 import com.baiyue.firstleg.oceanbooking.dto.OceanBookingDtos.*;
 import com.baiyue.firstleg.oceanbooking.entity.*;
 import com.baiyue.firstleg.oceanbooking.repository.OceanBookingRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.port.in.PriceBookQueryUseCase;
 import com.baiyue.firstleg.service.WarehouseSupplierSnapshotService;
 import com.baiyue.firstleg.service.FirstlegDocumentNumberGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -39,7 +39,7 @@ public class OceanBookingService {
     private static final Set<OceanBookingStatus> OPERATIONAL_LIST_STATUSES = Set.of(
         OceanBookingStatus.DRAFT, OceanBookingStatus.RELEASED);
     @Resource private OceanBookingRepository repository;
-    @Resource private PriceBookQueryRepository priceBooks;
+    @Resource private PriceBookQueryUseCase priceBooks;
     @Resource private ObjectMapper objectMapper;
     @Resource private WarehouseSupplierSnapshotService suppliers;
     @Resource private WarehouseMasterDataClient warehouses;

firstleg/src/main/java/com/baiyue/firstleg/pricebookquery/adapter/out/persistence/PriceBookQueryMapper.java

@@ -1,9 +1,10 @@
-package com.baiyue.firstleg.mapper;
+package com.baiyue.firstleg.pricebookquery.adapter.out.persistence;
 
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelTaxModeRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelPrefixRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelPrefixRow;
+import com.baiyue.firstleg.pricebookquery.application.port.out.PriceBookQueryReader;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -12,7 +13,7 @@ import java.util.List;
 
 /** Dedicated read model for merchant channel selection and reference estimates. */
 @Mapper
-public interface PriceBookQueryMapper {
+public interface PriceBookQueryMapper extends PriceBookQueryReader {
     @Select("""
         SELECT channel_code AS channelCode, inbound_code_prefix AS inboundCodePrefix,
                overseas_inbound_code_prefix AS overseasInboundCodePrefix

firstleg/src/main/java/com/baiyue/firstleg/pricebookquery/application/PriceBookQueryService.java

@@ -0,0 +1,45 @@
+package com.baiyue.firstleg.pricebookquery.application;
+
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelPrefixRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.port.in.PriceBookQueryUseCase;
+import com.baiyue.firstleg.pricebookquery.application.port.out.PriceBookQueryReader;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PriceBookQueryService implements PriceBookQueryUseCase {
+    @Resource private PriceBookQueryReader reader;
+
+    @Override public Long activeVersionId() { return reader.findActiveVersionId(); }
+    @Override public List<ChannelRow> channels(long versionId, long originWarehouseId) {
+        return reader.findChannels(versionId, originWarehouseId);
+    }
+    @Override public List<ChannelTaxModeRow> channelTaxModes(long versionId, long originWarehouseId) {
+        return reader.findChannelTaxModes(versionId, originWarehouseId);
+    }
+    @Override public List<RateRow> fbaRates(long versionId, long originWarehouseId, String channelCode,
+                                             String destinationCode, String pricingTaxMode) {
+        return reader.findFbaRates(versionId, originWarehouseId, channelCode, destinationCode, pricingTaxMode);
+    }
+    @Override public List<RateRow> overseasRates(long versionId, long originWarehouseId, String channelCode,
+                                                  long destinationWarehouseId, String pricingTaxMode) {
+        return reader.findOverseasRates(versionId, originWarehouseId, channelCode, destinationWarehouseId,
+            pricingTaxMode);
+    }
+    @Override public List<RateRow> regionTiers(long versionId, long originWarehouseId, String channelCode,
+                                                String regionCode, String pricingTaxMode) {
+        return reader.findRegionTiers(versionId, originWarehouseId, channelCode, regionCode, pricingTaxMode);
+    }
+    @Override public boolean channelAvailable(long versionId, long originWarehouseId, String channelCode) {
+        return channels(versionId, originWarehouseId).stream()
+            .anyMatch(channel -> channelCode.equals(channel.getChannelCode()));
+    }
+    @Override public ChannelPrefixRow channelPrefix(String channelCode) {
+        return reader.findChannelPrefix(channelCode);
+    }
+}

firstleg/src/main/java/com/baiyue/firstleg/pricebookquery/application/model/PriceBookQueryRows.java

@@ -1,4 +1,4 @@
-package com.baiyue.firstleg.repository;
+package com.baiyue.firstleg.pricebookquery.application.model;
 
 import lombok.Getter;
 import lombok.Setter;

firstleg/src/main/java/com/baiyue/firstleg/pricebookquery/application/port/in/PriceBookQueryUseCase.java

@@ -0,0 +1,22 @@
+package com.baiyue.firstleg.pricebookquery.application.port.in;
+
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelPrefixRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
+
+import java.util.List;
+
+public interface PriceBookQueryUseCase {
+    Long activeVersionId();
+    List<ChannelRow> channels(long versionId, long originWarehouseId);
+    List<ChannelTaxModeRow> channelTaxModes(long versionId, long originWarehouseId);
+    List<RateRow> fbaRates(long versionId, long originWarehouseId, String channelCode,
+                           String destinationCode, String pricingTaxMode);
+    List<RateRow> overseasRates(long versionId, long originWarehouseId, String channelCode,
+                                long destinationWarehouseId, String pricingTaxMode);
+    List<RateRow> regionTiers(long versionId, long originWarehouseId, String channelCode,
+                              String regionCode, String pricingTaxMode);
+    boolean channelAvailable(long versionId, long originWarehouseId, String channelCode);
+    ChannelPrefixRow channelPrefix(String channelCode);
+}

firstleg/src/main/java/com/baiyue/firstleg/pricebookquery/application/port/out/PriceBookQueryReader.java

@@ -0,0 +1,21 @@
+package com.baiyue.firstleg.pricebookquery.application.port.out;
+
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelPrefixRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
+
+import java.util.List;
+
+public interface PriceBookQueryReader {
+    Long findActiveVersionId();
+    List<ChannelRow> findChannels(long versionId, long originWarehouseId);
+    List<ChannelTaxModeRow> findChannelTaxModes(long versionId, long originWarehouseId);
+    List<RateRow> findFbaRates(long versionId, long originWarehouseId, String channelCode,
+                               String destinationCode, String pricingTaxMode);
+    List<RateRow> findOverseasRates(long versionId, long originWarehouseId, String channelCode,
+                                    long destinationWarehouseId, String pricingTaxMode);
+    List<RateRow> findRegionTiers(long versionId, long originWarehouseId, String channelCode,
+                                  String regionCode, String pricingTaxMode);
+    ChannelPrefixRow findChannelPrefix(String channelCode);
+}

firstleg/src/main/java/com/baiyue/firstleg/pricing/ActivePriceBookEstimator.java

@@ -7,9 +7,9 @@ import com.baiyue.firstleg.domain.PriceRegion;
 import com.baiyue.firstleg.domain.PricingDestinationType;
 import com.baiyue.firstleg.domain.PricingTaxMode;
 import com.baiyue.firstleg.dto.PriceBookDtos.EstimateRequest;
-import com.baiyue.firstleg.repository.PriceBookQueryRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.port.in.PriceBookQueryUseCase;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -21,7 +21,7 @@ import java.util.Locale;
 /** Single active-price-book lookup used by merchant estimates and inbound automatic billing. */
 @Component
 public class ActivePriceBookEstimator {
-    @Resource private PriceBookQueryRepository repository;
+    @Resource private PriceBookQueryUseCase repository;
     @Resource private FbaWarehouseRateEstimator fbaEstimator;
     @Resource private RegionWeightTierEstimator regionEstimator;
     @Resource private PriceBookWarehouseRegionResolver warehouseRegionResolver;

firstleg/src/main/java/com/baiyue/firstleg/pricing/FbaWarehouseRateEstimator.java

@@ -2,7 +2,7 @@ package com.baiyue.firstleg.pricing;
 
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

firstleg/src/main/java/com/baiyue/firstleg/pricing/RegionWeightTierEstimator.java

@@ -2,7 +2,7 @@ package com.baiyue.firstleg.pricing;
 
 import com.baiyue.common.core.api.ResultCode;
 import com.baiyue.common.core.exception.BizException;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;

firstleg/src/main/java/com/baiyue/firstleg/repository/PriceBookQueryRepository.java

@@ -1,53 +0,0 @@
-package com.baiyue.firstleg.repository;
-
-import com.baiyue.firstleg.mapper.PriceBookQueryMapper;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public class PriceBookQueryRepository {
-    @Resource
-    private PriceBookQueryMapper mapper;
-
-    public Long activeVersionId() {
-        return mapper.findActiveVersionId();
-    }
-
-    public List<PriceBookQueryRows.ChannelRow> channels(long versionId, long originWarehouseId) {
-        return mapper.findChannels(versionId, originWarehouseId);
-    }
-
-    public List<PriceBookQueryRows.ChannelTaxModeRow> channelTaxModes(long versionId, long originWarehouseId) {
-        return mapper.findChannelTaxModes(versionId, originWarehouseId);
-    }
-
-    public List<PriceBookQueryRows.RateRow> fbaRates(long versionId, long originWarehouseId,
-                                                      String channelCode, String destinationCode,
-                                                      String pricingTaxMode) {
-        return mapper.findFbaRates(versionId, originWarehouseId, channelCode, destinationCode, pricingTaxMode);
-    }
-
-    public List<PriceBookQueryRows.RateRow> overseasRates(long versionId, long originWarehouseId,
-                                                           String channelCode, long destinationWarehouseId,
-                                                           String pricingTaxMode) {
-        return mapper.findOverseasRates(versionId, originWarehouseId, channelCode, destinationWarehouseId,
-            pricingTaxMode);
-    }
-
-    public List<PriceBookQueryRows.RateRow> regionTiers(long versionId, long originWarehouseId,
-                                                        String channelCode, String regionCode,
-                                                        String pricingTaxMode) {
-        return mapper.findRegionTiers(versionId, originWarehouseId, channelCode, regionCode, pricingTaxMode);
-    }
-
-    public boolean channelAvailable(long versionId, long originWarehouseId, String channelCode) {
-        return channels(versionId, originWarehouseId).stream()
-            .anyMatch(channel -> channelCode.equals(channel.getChannelCode()));
-    }
-
-    public PriceBookQueryRows.ChannelPrefixRow channelPrefix(String channelCode) {
-        return mapper.findChannelPrefix(channelCode);
-    }
-}

firstleg/src/main/java/com/baiyue/firstleg/service/ContainerService.java

@@ -22,8 +22,8 @@ import com.baiyue.firstleg.mapper.ContainerTransportHistoryMapper;
 import com.baiyue.firstleg.repository.ContainerRepository;
 import com.baiyue.firstleg.repository.LoadingPickRepository;
 import com.baiyue.firstleg.repository.SmartLoadingRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.port.in.PriceBookQueryUseCase;
 import com.baiyue.firstleg.oceanbooking.repository.OceanBookingRepository;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingEntity;
 import com.baiyue.firstleg.oceanbooking.entity.OceanBookingContainerRequirementEntity;
@@ -44,7 +44,7 @@ public class ContainerService {
     @Resource private SmartLoadingRepository smartLoadingRepository;
     @Resource private LoadingPickRepository loadingPickRepository;
     @Resource private LoadingPickService loadingPickService;
-    @Resource private PriceBookQueryRepository priceBooks;
+    @Resource private PriceBookQueryUseCase priceBooks;
     @Resource private OceanBookingRepository oceanBookings;
     @Resource private WarehouseSupplierSnapshotService suppliers;
     @Resource private FirstlegDocumentNumberGenerator documentNumbers;

firstleg/src/main/java/com/baiyue/firstleg/service/FbaPricingService.java

@@ -14,7 +14,7 @@ import com.baiyue.firstleg.entity.InboundFeeItemEntity;
 import com.baiyue.firstleg.entity.InboundPricingEntity;
 import com.baiyue.firstleg.entity.InboundPricingIdempotencyEntity;
 import com.baiyue.firstleg.pricing.ActivePriceBookEstimator;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.RateRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.RateRow;
 import com.baiyue.firstleg.repository.FbaPricingRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

firstleg/src/main/java/com/baiyue/firstleg/service/MerchantPriceBookService.java

@@ -9,9 +9,9 @@ import com.baiyue.firstleg.dto.PriceBookDtos.EstimateRequest;
 import com.baiyue.firstleg.dto.PriceBookDtos.EstimateResponse;
 import com.baiyue.firstleg.dto.PriceBookChannelValidation.Response;
 import com.baiyue.firstleg.pricing.ActivePriceBookEstimator;
-import com.baiyue.firstleg.repository.PriceBookQueryRepository;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelRow;
-import com.baiyue.firstleg.repository.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelRow;
+import com.baiyue.firstleg.pricebookquery.application.model.PriceBookQueryRows.ChannelTaxModeRow;
+import com.baiyue.firstleg.pricebookquery.application.port.in.PriceBookQueryUseCase;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -26,7 +26,7 @@ import java.util.Map;
 public class MerchantPriceBookService {
     public static final String DISCLAIMER = "仅供参考，不含附加费，最终以实际结算为准";
 
-    @Resource private PriceBookQueryRepository repository;
+    @Resource private PriceBookQueryUseCase repository;
     @Resource private ActivePriceBookEstimator estimator;
 
     public List<CurrentChannel> channels(long merchantTenantId, long originWarehouseId) {