Browse Source

修复bug

master
zhaoyiran 8 months ago
parent
commit
d5b7e1a1d8
  1. 12
      src/main/java/com/win/bank/service/cmb/CmbServiceImpl.java
  2. 4
      src/main/resources/application-dev.yml

12
src/main/java/com/win/bank/service/cmb/CmbServiceImpl.java

@ -223,8 +223,8 @@ public class CmbServiceImpl implements BaseBankService {
basicInvoiceDO.setQueryType(A.getCode());
basicInvoiceDO.setQueryTypeName(A.getDescription());
basicInvoiceDO.setOriginalUserName(saleInvoice.getUserName());
if (StringUtils.isNotEmpty(saleInvoice.getUserRemark())) {
basicInvoiceDO.setUserName(saleInvoice.getUserRemark());
if (StringUtils.isNotEmpty(saleInvoice.getUserRemark().trim())) {
basicInvoiceDO.setUserName(saleInvoice.getUserRemark().trim());
}
basicInvoiceDO.setBankTaxRate(saleInvoice.getTaxRate());
if (specialTicket.contains(saleInvoice.getInvoiceType())) {
@ -253,8 +253,8 @@ public class CmbServiceImpl implements BaseBankService {
basicInvoiceDO.setQueryType(I.getCode());
basicInvoiceDO.setQueryTypeName(I.getDescription());
basicInvoiceDO.setOriginalUserName(financialInvoice.getUserName());
if (StringUtils.isNotEmpty(financialInvoice.getUserRemark())) {
basicInvoiceDO.setUserName(financialInvoice.getUserRemark());
if (StringUtils.isNotEmpty(financialInvoice.getUserRemark().trim())) {
basicInvoiceDO.setUserName(financialInvoice.getUserRemark().trim());
}
basicInvoiceDO.setInvoiceTypeName(Objects.requireNonNull(CmbFinInvoiceTypeEnum.getByCode(basicInvoiceDO.getFinInvoiceType())).getDescription());
basicInvoiceDO.setBankTaxRate(zero);
@ -284,8 +284,8 @@ public class CmbServiceImpl implements BaseBankService {
basicInvoiceDO.setAmountTax(basicInvoiceDO.getTotalAmount());
basicInvoiceDO.setTotalAmount(null);
basicInvoiceDO.setOriginalUserName(ticketInvoice.getUserName());
if (StringUtils.isNotEmpty(ticketInvoice.getUserRemark())) {
basicInvoiceDO.setUserName(ticketInvoice.getUserRemark());
if (StringUtils.isNotEmpty(ticketInvoice.getUserRemark().trim())) {
basicInvoiceDO.setUserName(ticketInvoice.getUserRemark().trim());
}
basicInvoiceDO.setBankTaxRate(zero);

4
src/main/resources/application-dev.yml

@ -42,9 +42,9 @@ logging:
# 招商银行
cmb:
# 用户ID,前置机查看
uid: U003638176
uid: U032040178
# 业务模式,前置机查看
busMod: "00001"
busMod: "S2006"
url: http://192.168.0.142:8080/cdcserver/api/v2
# 发票相关配置
invoice:

Loading…
Cancel
Save