Merge branch 'dev_20260429' into dev_WMS20260401

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE,url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 
@@ -35,6 +35,13 @@ public interface BmsServiceFeign {
     @GetMapping("/settlementCustomersApi/getInfoByCode")
     public AjaxResult getCustomersInfoByCode(@RequestParam("settlementCustomersCode")String settlementCustomersCode);
 
+    /**
+     * 按结算主体ID（如货主ID，对应 settlement_customers.settlement_entity_id）查询结算对象
+     */
+    @GetMapping("/settlementCustomersApi/getInfoBySettlementEntityId")
+    AjaxResult getCustomersInfoBySettlementEntityId(@RequestParam("settlementEntityId") Long settlementEntityId,
+                                                    @RequestParam(value = "topOrganizationId", required = false) Long topOrganizationId);
+
 
     /**
      * 推送同步业务单据

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteBmsFeignFallbackFactory.java

@@ -42,6 +42,11 @@ public class RemoteBmsFeignFallbackFactory implements FallbackFactory<BmsService
                 return AjaxResult.error(throwable.getMessage());
             }
 
+            @Override
+            public AjaxResult getCustomersInfoBySettlementEntityId(Long settlementEntityId, Long topOrganizationId) {
+                return AjaxResult.error(throwable.getMessage());
+            }
+
             @Override
             public AjaxResult pushSyncData(BusinessDataPushDTO businessDataPushDTO) {
                 return AjaxResult.error(throwable.getMessage());