weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/test' into dev

Browse Source
This commit is contained in:
王奎兴
2026-01-14 22:28:59 +08:00
parent a648c4a50d 536079a024
commit 0533d1a941
15 changed files with 118 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-auth/src/main/resources/bootstrap.yml
+9 -9
View File
@@ -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}
mhd-gateway/src/main/resources/bootstrap.yml
+3 -7
View File
@@ -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
# 共享配置
mhd-modules/mhd-system/src/main/resources/bootstrap.yml
+5 -9
View File
@@ -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}
mhd-user-center/src/main/resources/bootstrap.yml
+9 -7
View File
@@ -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
mhd_finance/src/main/java/com/linke/finance/application/server/businessDocument/BusinessDocumentApplicationService.java
+5 -1
View File
@@ -591,6 +591,10 @@ public class BusinessDocumentApplicationService {
return businessDocumentDomainService.queryList(businessDocumentDO);
}
public List<Map<String,Object>> getFeeList(String invoiceId) {
return businessDocumentDomainService.getFeeList(invoiceId);
}
/**
* 修改业务单据支付状态，同步网货修改支付状态
*/
@@ -1659,4 +1663,4 @@ public class BusinessDocumentApplicationService {
return true;
}
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/facade/IBusinessDocumentService.java
+4 -1
View File
@@ -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<BusinessDocument>
*/
public List<BusinessDocumentPO> queryList(BusinessDocumentDO businessDocumentDO);
public List<Map<String,Object>> getFeeList(String invoiceId);
/**
* 新增业务单据
*/
@@ -60,4 +63,4 @@ public interface IBusinessDocumentService extends IService<BusinessDocument>
List<BusinessDocumentDetaliPO> querySettlementList(BusinessDocumentDO businessDocumentDO);
BusinessDocument getByWaybillNo(String waybillNo);
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/mapper/BusinessDocumentMapper.java
+5 -1
View File
@@ -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<BusinessDocument>
*/
public List<BusinessDocumentPO> queryList(BusinessDocumentDO businessDocumentDO);
List<Map<String,Object>> getFeeList(@Param("invoiceId")String invoiceId);
/**
* 查询申请开票业务单据列表
*/
@@ -38,4 +42,4 @@ public interface BusinessDocumentMapper extends BaseMapper<BusinessDocument>
List<BusinessDocumentPO> queryListByReconciliation(BusinessDocumentDO businessDocumentDO);
List<BusinessDocumentDetaliPO> querySettlementList(@Param("businessDocumentDO") BusinessDocumentDO businessDocumentDO);
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/repository/persistence/BusinessDocumentImpl.java
+8 -1
View File
@@ -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<BusinessDocumentMapper, Bu
return businessDocumentMapper.queryList(businessDocumentDO);
}
@Override
public List<Map<String,Object>> getFeeList(String invoiceId)
{
return businessDocumentMapper.getFeeList(invoiceId);
}
/**
* 新增业务单据
*/
@@ -130,4 +137,4 @@ public class BusinessDocumentImpl extends ServiceImpl<BusinessDocumentMapper, Bu
return businessDocument;
}
}
}
mhd_finance/src/main/java/com/linke/finance/domain/businessDocument/service/BusinessDocumentDomainService.java
+6 -5
View File
@@ -21,10 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
/**
* 业务单据
@@ -50,6 +47,10 @@ public class BusinessDocumentDomainService {
return businessDocumentService.queryList(businessDocumentDO);
}
public List<Map<String,Object>> getFeeList(String invoiceId) {
return businessDocumentService.getFeeList(invoiceId);
}
/**
* 新增业务单据
@@ -202,4 +203,4 @@ public class BusinessDocumentDomainService {
}
}
mhd_finance/src/main/java/com/linke/finance/interfaces/facade/reconciliation/ReconciliationApi.java
+14 -1
View File
@@ -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<List<Map<String,Object>>> getFeeList(@RequestParam String invoiceId)
{
List<Map<String,Object>> list = businessDocumentApplicationService.getFeeList(invoiceId);
return R.ok(list);
}
/**
* 生成对账单（调账对账）
*/
@@ -297,4 +310,4 @@ public class ReconciliationApi extends BaseController{
}
}
}
mhd_finance/src/main/resources/bootstrap.yml
+10 -6
View File
@@ -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，如果使用默认分组可以不配置
mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml
+10 -1
View File
@@ -131,6 +131,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBusinessDocumentPo1"/>
</select>
<select id="getFeeList" parameterType="java.lang.String" resultType="java.util.Map">
SELECT
SUBJECT_NAME,AMOUNT,RATE
FROM
RECONCILIATION_ACCOUNT
WHERE
RECONCILIATION_ID = #{invoiceId}
</select>
<select id="queryInvoiceList" resultType="com.linke.finance.domain.businessDocument.repository.po.BusinessDocumentPO" parameterType="com.linke.finance.domain.businessDocument.repository.todo.BusinessDocumentDO">
<include refid="selectBusinessDocumentPo"/>
where del_flag = 1
@@ -288,4 +297,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</sql>
</mapper>
</mapper>
mhd_product/src/main/resources/bootstrap.yml
+10 -6
View File
@@ -20,17 +20,21 @@ 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: 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，如果使用默认分组可以不配置
mhd_thrid_party/src/main/resources/bootstrap.yml
+10 -6
View File
@@ -20,17 +20,21 @@ 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: 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，如果使用默认分组可以不配置
mhd_transport/src/main/resources/bootstrap.yml
+10 -6
View File
@@ -21,17 +21,21 @@ spring:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置使用ip+端口号
# server-addr: 10.33.0.129:6010r
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
# 线上测试环境配置使用ip+端口号
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.33.0.129:6010
#线上正式环境
# server-addr: 10.102.192.105:6848