|
|
@@ -182,7 +182,7 @@ public class NhIVController {
|
|
|
String kind = UtilMap.getString(item, "TypeDescription");
|
|
|
String invoiceName = UtilMap.getString(item, "SubTypeDescription");
|
|
|
if (kind.equals("全电发票")) {
|
|
|
- kind = invoiceName.contains("专用发票") ? "全电专用发票" : "全电普通发票";
|
|
|
+ kind = invoiceName.contains("铁路电子客票")?"火车票": invoiceName.contains("专用发票") ? "全电专用发票" : "全电普通发票";
|
|
|
}
|
|
|
if (kind.equals("增值税发票")) {
|
|
|
kind = invoiceName.contains("增值税专用发票") ? "增值税专用发票" : "增值税普通发票";
|
|
|
@@ -200,7 +200,7 @@ public class NhIVController {
|
|
|
.date(UtilString.replaceDateZH_cn(UtilMap.getString(prop, "Date")))
|
|
|
.checkCode(UtilMap.getString(prop, "CheckCode"))
|
|
|
// ppExt: 多明细行时, 优先取值合计 [全电票返回了subTotal字段, 但值为空]
|
|
|
- .amount(UtilNumber.setBigDecimal(UtilMap.getString_first(prop, "SubTotal", "Total", "Fare")))
|
|
|
+ .amount(UtilNumber.setBigDecimal(UtilMap.getString_first(prop, "Total","SubTotal", "Fare")))
|
|
|
.tax(UtilNumber.setBigDecimal(UtilMap.getString_first(prop, "SubTax", "Tax")))
|
|
|
.excludingTax(UtilNumber.setBigDecimal(UtilMap.getString(prop, "PretaxAmount")))
|
|
|
.buyerName(StringUtils.isBlank(guyuanNameRepalce(UtilMap.getString(prop, "Buyer")))?"上海能辉科技股份有限公司":guyuanNameRepalce(UtilMap.getString(prop, "Buyer")))
|
