diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 8cc2db8..074b247 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -118,7 +118,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer invoiceBackQueryWrapper.eq("system_orderno", invoice.getOutTradeOrderno()); InvoiceBack invoiceBackVali = invoiceBackMapper.selectOne(invoiceBackQueryWrapper); - if(BeanUtil.isEmpty(invoiceBackVali)){ + if (BeanUtil.isEmpty(invoiceBackVali)) { invoiceBackVali = new InvoiceBack(); invoiceBackVali.setSystemOrderno(invoice.getOutTradeOrderno()); invoiceBackVali.setCreateTime(new Date()); @@ -135,7 +135,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer invoiceBackVali.setUpdateTime(new Date()); invoiceBackMapper.insertInvoiceBack(invoiceBackVali); - }else{ + } else { invoiceBackVali.setResultCode("0000"); invoiceBackVali.setResultMsg("开票成功!"); invoiceBackVali.setStatus("0"); @@ -145,7 +145,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer // 再次推送 try { - callBackAisino(invoiceBackVali, "", companyservice.getIdentity(),invoice.getId()); + callBackAisino(invoiceBackVali, "", companyservice.getIdentity(), invoice.getId()); } catch (Exception e) { log.info("【重汽批量开票】发票回调失败!invoiceId={}", invoice.getId()); } @@ -270,7 +270,6 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer List> listMap = new ArrayList<>(); for (BillDetail billDetail : billDetailList) { AisinoConsoleInvoiceAddDetailDTO addDetailDTO = BeanUtil.copyProperties(billDetail, AisinoConsoleInvoiceAddDetailDTO.class); - //通过含税标志,区分含税单价不含税单价 Integer hsbz = billDetail.getHsbz(); if (hsbz == null) { @@ -437,7 +436,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer // 回调,失败的交给定时任务 InvoiceBack finalQueryInvoiceBack = queryInvoiceBack; try { - callBackAisino(finalQueryInvoiceBack, callBackUrl, "",invoice.getId()); + callBackAisino(finalQueryInvoiceBack, callBackUrl, "", invoice.getId()); } catch (Exception e) { log.info("【重汽批量开票】发票回调失败!invoiceId={}", invoice.getId()); } @@ -465,7 +464,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer * @param id */ @Override - public void callBackAisino(InvoiceBack invoiceBack, String callBackUrl, String identity,Long id) { + public void callBackAisino(InvoiceBack invoiceBack, String callBackUrl, String identity, Long id) { // TODO: 2023/10/27 回调处理 @@ -498,7 +497,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer jsonResult.set("message", invoiceBack.getResultMsg()); jsonResult.set("data", invoice);*/ - log.info("【控制台】发票回调接口,发送数据开始,id={},callBackUrl={},param={}", id,callBackUrl,JSONUtil.toJsonStr(invoice)); + log.info("【控制台】发票回调接口,发送数据开始,id={},callBackUrl={},param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice)); String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice)); log.info("【控制台】发票回调接口,发送数据结束,id={},接口返回信息={}", id, result); @@ -1025,7 +1024,7 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer return new HXResponse("9999", "系统异常!!!"); } - return new HXResponse("0000", "查询成功!", red, true); + return new HXResponse("0000", "查询成功!", red, true,""); } } @@ -1499,16 +1498,46 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer */ public static Integer CovertInvoiceType(String invoiceType) { + /** 控制台发票种类: + 专用发票 = 0, + 普通发票 = 2, + 货物运输业增值税专用发票 = 11, + 机动车销售统一发票 = 12, + 卷式普通发票 = 41, + 电子发票 = 51, + 农产品收购普通发票 = 20, + 农产品收购电子发票 = 21, + 电子专票 = 52*/ + /** 简税发票种类 + * 默认为普通电票p。 + 卷票 r 只支持13 行明细; + p:电子增值税普通发票, 2 + c:增值税普通发票(纸票):普票 2 + s:增值税专用发票:专票、机动车专票 0 + j:机动车销售统一发票 12 + e: 收购发票(电子), 21 + f:收购发票(纸质), 20 + r:增值税普通发票(卷式), 2 + b:增值税电子专用发票, 0 + 82:数电普通, + 81:数电专票*/ + /** * 发票种类 invoice_type( p电子增值税普通发票 c增值税普通发票 s 增值税专用发票 e 收购发票 f 收购发票 r增值税普通发票) */ if (StrUtil.isEmpty(invoiceType)) { return -1; } - if ("p".equals(invoiceType) || "c".equals(invoiceType) || "e".equals(invoiceType) || "f".equals(invoiceType) || "r".equals(invoiceType)) { + if ("p".equals(invoiceType) || "c".equals(invoiceType) || "r".equals(invoiceType)) { return 2; - } else if ("s".equals(invoiceType)) { + } else if ("s".equals(invoiceType) || "b".equals(invoiceType)) { return 0; + } else if ("j".equals(invoiceType)) { + return 12; + } else if ("e".equals(invoiceType)) { + return 21; + } else if ("f".equals(invoiceType)) { + return 20; } return -1; @@ -1528,6 +1557,12 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer return "p"; } else if (invoiceType.equals("0")) { return "s"; + }else if (invoiceType.equals("12")) { + return "j"; + }else if (invoiceType.equals("21")) { + return "e"; + }else if (invoiceType.equals("20")) { + return "f"; } return ""; }