diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index cab201300..3613e9493 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -474,8 +474,8 @@ public class LeaseApplicationService { businessDataPushDTO.setDocumentFormJson(jsonObject.toJSONString()); businessDataPushDTO.setDocumentTypeCode("ckzld"); businessDataPushDTO.setSettlementEntityId(leasePO.getShipperId()); - businessDataPushDTO.setSecondSubjectCode("26WMS01"); - businessDataPushDTO.setServiceItemsCode("26WMS费用"); + businessDataPushDTO.setSecondSubjectCode(leasePO.getSecondSubjectCode()); + businessDataPushDTO.setServiceItemsCode(leasePO.getServiceItemsCode()); businessDataPushDTO.setDataSources(1); bmsServiceFeign.businessDocumentApiSave(businessDataPushDTO); } diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java index 9b56d9f1e..dd9602190 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/mapper/BillManageMapper.java @@ -31,4 +31,6 @@ public interface BillManageMapper extends BaseMapper String getServiceItemsCodeNc(@Param("name") String name); + String getNcUrl(@Param("interfaceType") String interfaceType,@Param("organizationName") String organizationName,@Param("organizationId") Long organizationId); + } \ No newline at end of file diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java index a2b4bc3e7..bc6f6ff75 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/persistence/BillManageImpl.java @@ -192,13 +192,11 @@ public class BillManageImpl extends ServiceImpl im count++; List ysitemList=new ArrayList(); String url = ""; - SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); - query.setOrganizationId(reconciliation.getOrganizationId()); - query.setOrganizationName(reconciliation.getOrganizationName()); - query.setInterfaceType("nc"); - List urlList = thirdPartyServiceFeign.queryList(query); - if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceTypeValue(); + Long organizationId = reconciliation.getOrganizationId(); + String organizationName = reconciliation.getOrganizationName(); + String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId); + if (ncUrl!=null&&ncUrl!="") { + url = ncUrl; } else { throw new ServiceException("未找到该组织的推送地址!"); } @@ -438,13 +436,11 @@ public class BillManageImpl extends ServiceImpl im ReconciliationDTO reconciliationDTO=new ReconciliationDTO(); reconciliationDTO.setInnerNumber(reconciliation.getBillNumber()); String url = ""; - SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); - query.setOrganizationId(reconciliation.getOrganizationId()); - query.setOrganizationName(reconciliation.getOrganizationName()); - query.setInterfaceType("nc"); - List urlList = thirdPartyServiceFeign.queryList(query); - if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceTypeValue(); + Long organizationId = reconciliation.getOrganizationId(); + String organizationName = reconciliation.getOrganizationName(); + String ncUrl = billManageMapper.getNcUrl("nc", organizationName, organizationId); + if (ncUrl!=null&&ncUrl!="") { + url = ncUrl; } else { throw new ServiceException("未找到该组织的推送地址!"); } diff --git a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml index 24eaa4cc2..87586c3f0 100644 --- a/mhd_bms/src/main/resources/mapper/BillManageMapper.xml +++ b/mhd_bms/src/main/resources/mapper/BillManageMapper.xml @@ -101,7 +101,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index fed0acebe..16a84eea7 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,17 +20,17 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.5:6848 +# username: nacos +# password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + server-addr: 10.33.0.129:6010 +# server-addr: 10.102.192.5:6848 +# username: nacos +# password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP,如果使用默认分组可以不配置