diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index eede5c5a3..d0b615c93 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -14,21 +14,21 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 +# 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.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index 2d80c4c78..c01da61c0 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -18,18 +18,14 @@ spring: # server-addr: 10.102.192.5:6848 # 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 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 # 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，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index dc7b508d7..147449747 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -15,21 +15,17 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + 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 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + 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，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 73d8acd49..098ff9621 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,17 +20,19 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 - username: nacos - password: manhuoda@2023 + # 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.33.0.129:6010 #线上正式环境 - server-addr: 10.102.192.5:6848 + # server-addr: 10.102.192.5:6848 + # username: nacos + # password: manhuoda@2023 username: nacos password: manhuoda@2023 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 @@ -44,4 +46,4 @@ spring: max-request-size: 50MB mybatis-plus: configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java index b0f0922df..1bbc05a16 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java @@ -591,6 +591,10 @@ public class BusinessDocumentApplicationService { return businessDocumentDomainService.queryList(businessDocumentDO); } + public List> getFeeList(String invoiceId) { + return businessDocumentDomainService.getFeeList(invoiceId); + } + /** * 修改业务单据支付状态，同步网货修改支付状态 */ @@ -1659,4 +1663,4 @@ public class BusinessDocumentApplicationService { return true; } -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java index 0a71e15f3..5764ce24d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java @@ -10,6 +10,7 @@ import com.linke.finance.domain.businessDocumentDetali.repository.po.BusinessDoc import com.linke.finance.domain.reconciliation.repository.po.ReconciliationPO; import java.util.List; +import java.util.Map; /** * 业务单据Service接口 @@ -24,6 +25,8 @@ public interface IBusinessDocumentService extends IService */ public List queryList(BusinessDocumentDO businessDocumentDO); + public List> getFeeList(String invoiceId); + /** * 新增业务单据 */ @@ -60,4 +63,4 @@ public interface IBusinessDocumentService extends IService List querySettlementList(BusinessDocumentDO businessDocumentDO); BusinessDocument getByWaybillNo(String waybillNo); -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java index 531cba8a3..f3b027f53 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java @@ -1,6 +1,8 @@ package com.linke.finance.domain.businessDocument.repository.mapper; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linke.finance.domain.businessDocument.entity.BusinessDocument; import com.linke.finance.domain.businessDocument.repository.po.AccountsReceivableAppPO; @@ -24,6 +26,8 @@ public interface BusinessDocumentMapper extends BaseMapper */ public List queryList(BusinessDocumentDO businessDocumentDO); + List> getFeeList(@Param("invoiceId")String invoiceId); + /** * 查询申请开票业务单据列表 */ @@ -38,4 +42,4 @@ public interface BusinessDocumentMapper extends BaseMapper List queryListByReconciliation(BusinessDocumentDO businessDocumentDO); List querySettlementList(@Param("businessDocumentDO") BusinessDocumentDO businessDocumentDO); -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java index 4a12f17a0..35de19fb6 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java @@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 业务单据Service业务层处理 @@ -39,6 +40,12 @@ public class BusinessDocumentImpl extends ServiceImpl> getFeeList(String invoiceId) + { + return businessDocumentMapper.getFeeList(invoiceId); + } + /** * 新增业务单据 */ @@ -130,4 +137,4 @@ public class BusinessDocumentImpl extends ServiceImpl> getFeeList(String invoiceId) { + return businessDocumentService.getFeeList(invoiceId); + } + /** * 新增业务单据 @@ -202,4 +203,4 @@ public class BusinessDocumentDomainService { -} +} \ No newline at end of file diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java index 4e3099400..6f718ae96 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java @@ -2,6 +2,7 @@ package com.linke.finance.interfaces.facade.reconciliation; import java.util.Date; import java.util.List; +import java.util.Map; import com.linke.finance.application.server.businessDocument.BusinessDocumentApplicationService; import com.linke.finance.application.server.reconciliation.ReconciliationApplicationService; @@ -11,6 +12,7 @@ import com.linke.finance.domain.reconciliation.entity.Reconciliation; import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO; import com.linke.finance.interfaces.assembler.businessDocument.BusinessDocumentAssembler; import com.mhd.common.core.domain.dto.BusinessDocumentDTO; +import com.mhd.common.core.domain.entity.R; import com.mhd.common.log.annotation.Log; import com.mhd.common.log.enums.BusinessType; import io.swagger.annotations.ApiOperation; @@ -193,6 +195,17 @@ public class ReconciliationApi extends BaseController{ return getDataTable(list); } + + /** + * 对账单详情 + */ + @GetMapping("/getFeeListByInvoiceId") + public R>> getFeeList(@RequestParam String invoiceId) + { + List> list = businessDocumentApplicationService.getFeeList(invoiceId); + return R.ok(list); + } + /** * 生成对账单（调账对账） */ @@ -297,4 +310,4 @@ public class ReconciliationApi extends BaseController{ } -} +} \ 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 8132a55fb..f0c89998d 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,18 +20,22 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - 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 config: # server-addr: 127.0.0.1:8848 # server-addr: 116.204.23.92:8848 # 线上测试环境配置 容器名+端口号 - 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，如果使用默认分组可以不配置 diff --git a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml index 5bb7cc317..e54fdc9ba 100644 --- a/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml +++ b/mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml @@ -131,6 +131,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +