|
|
@ -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); |
|
|
|