区块链发票入库：明细处理百分数、开票日期转化问题

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

@@ -864,7 +864,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             invoiceInfo.setImageId(invoice.getFileId());
 
             if (StringUtils.isNotBlank(invoice.getBillingDate())){
-                Date invoiceDate = DateUtils.strToDateLong(invoice.getBillingDate());
+                Date invoiceDate = DateUtils.strToDate(invoice.getBillingDate());
                 invoiceInfo.setInvoiceDate(invoiceDate);
             }
 
@@ -905,8 +905,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 BigDecimal taxRate = strToBigDecimal(invoiceDetail.getTaxRate());
                 if (taxRate != null){
                     invoiceDetailInfo.setTaxRate(taxRate.multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString());
-                }else {
-                    invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate());
+                }else if (StringUtils.isBlank(invoiceDetail.getTaxRate())){
+                    invoiceDetailInfo.setTaxRate(invoiceDetail.getTaxRate().replace("%",""));
                 }
                 invoiceDetailList.add(invoiceDetailInfo);