diff --git a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/config/util/InvoiceHelper.java b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/config/util/InvoiceHelper.java index 9f0e79d..ae3ec4d 100644 --- a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/config/util/InvoiceHelper.java +++ b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/config/util/InvoiceHelper.java @@ -176,7 +176,20 @@ public class InvoiceHelper { order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制） order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制） order.setInvoiceType("1");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口） - order.setInvoiceLine("p");//开票种类 + //发票种类：p,普通发票(电票)(默认);c,普通 + //发票(纸票);s,专用发票;e,收购发票(电票);f, + //收购发票(纸质);r,普通发票(卷式);b,增值税 + //电子专用发票;j,机动车销售统一发票;u,二手 + //车销售统一发票;bs:电子发票(增值税专用 + //发票)-即数电专票(电子),pc:电子发票(普通 + //发票)-即数电普票(电子),es:数电纸质发票( + //增值税专用发票)-即数电专票(纸质);ec:数 + //电纸质发票(普通发票)-即数电普票(纸质) + if(userInvoices.getInvoicesType()==0 || userInvoices.getInvoicesType()==1) { + order.setInvoiceLine("pc");//开票种类 + }else { + order.setInvoiceLine("bs");//开票种类 + } order.setCallBackUrl(_callBackUrl);//回调地址 order.setSalerTaxNum(_salerTaxNum);//销方税号 order.setSalerTel(_salerTel);//销方电话 @@ -221,7 +234,11 @@ public class InvoiceHelper { order.setBuyerPhone(userInvoices.getBuyerPhone());//购方手机（pushMode为1或2时，此项为 必填，同时受企业资质是否必填控制） order.setEmail(userInvoices.getBuyerEmail());//推送邮箱（pushMode为0或2时，此项为必填，同时受企业资质是否必填控制） order.setInvoiceType("2");//开票类型：1:蓝票;2:红票 （数电票冲红请 对接数电快捷冲红接口） - order.setInvoiceLine("p");//开票种类 + if(userInvoices.getInvoicesType()==0 || userInvoices.getInvoicesType()==1) { + order.setInvoiceLine("pc");//开票种类 + }else { + order.setInvoiceLine("bs");//开票种类 + } order.setCallBackUrl(_callBackUrl);//回调地址 order.setSalerTaxNum(_salerTaxNum);//销方税号 order.setSalerTel(_salerTel);//销方电话 diff --git a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java index 7bac9f4..9d72806 100644 --- a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java +++ b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/app/AppUserInvoicesController.java @@ -99,7 +99,7 @@ public class AppUserInvoicesController { userInvoices.setStatus(1); //1.进行远程开票(蓝票，普票) - if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { + //if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil); ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId()); String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig); @@ -118,10 +118,10 @@ public class AppUserInvoicesController { String result2 = object.getString("describe"); return Result.exception(511, result2); } - } else { - //3,专票只进行记录 - userInvoices.setSyncStatus(-1); - } +// } else { +// //3,专票只进行记录 +// userInvoices.setSyncStatus(-1); +// } //3.结束返回 UserInvoices entity = userInvoicesService.insert(userInvoices); orders.setUserInvoicesId(entity.getUserInvoicesId()); @@ -148,8 +148,8 @@ public class AppUserInvoicesController { return Result.exception(511, "发票不存在"); } //如果发票是普通发票 - if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) - { +// if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) +// { //0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败 if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40)) { @@ -179,13 +179,13 @@ public class AppUserInvoicesController { ordersService.update(orders); } - }else { - userInvoices.setSyncStatus(90); - orders.setUserInvoicesId(0); - Orders update = ordersService.update(orders); - userInvoicesService.update(userInvoices); - - } +// }else { +// userInvoices.setSyncStatus(90); +// orders.setUserInvoicesId(0); +// Orders update = ordersService.update(orders); +// userInvoicesService.update(userInvoices); +// +// } return Result.success(null); } diff --git a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java index 6c1cd80..234d381 100644 --- a/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java +++ b/JAVA_MYSQL_HCJXJY/jxjy-web/src/main/java/com/hc/web/controller/browser/front/FrontUserInvoicesController.java @@ -98,7 +98,7 @@ public class FrontUserInvoicesController { userInvoices.setStatus(1); //1.进行远程开票(蓝票，普票) - if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { + //if (userInvoices.getInvoicesType() == 1 || userInvoices.getInvoicesType() == 0) { InvoiceHelper invoiceHelper = new InvoiceHelper(redisUtil); ClassConfig classConfig = classConfigService.queryById(userInvoices.getClassId()); String json = invoiceHelper.GetKPJsonStr(userInvoices,classConfig); @@ -117,10 +117,10 @@ public class FrontUserInvoicesController { String result2 = object.getString("describe"); return Result.exception(511, result2); } - } else { - //3,专票只进行记录 - userInvoices.setSyncStatus(-1); - } +// } else { +// //3,专票只进行记录 +// userInvoices.setSyncStatus(-1); +// } //3.结束返回 UserInvoices entity = userInvoicesService.insert(userInvoices); orders.setUserInvoicesId(entity.getUserInvoicesId()); @@ -147,8 +147,8 @@ public class FrontUserInvoicesController { return Result.exception(511, "发票不存在"); } //如果发票是普通发票 - if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) - { +// if(userInvoices.getInvoicesType()==1 ||userInvoices.getInvoicesType()==0) +// { //0申请中 10申请成功，20开票完成，30开票失败，40开票成功签章失败 if(userInvoices.getSyncStatus().equals(20) || userInvoices.getSyncStatus().equals(40)) { @@ -178,13 +178,13 @@ public class FrontUserInvoicesController { ordersService.update(orders); } - }else { - userInvoices.setSyncStatus(90); - orders.setUserInvoicesId(0); - Orders update = ordersService.update(orders); - userInvoicesService.update(userInvoices); - - } +// }else { +// userInvoices.setSyncStatus(90); +// orders.setUserInvoicesId(0); +// Orders update = ordersService.update(orders); +// userInvoicesService.update(userInvoices); +// +// } return Result.success(null); } diff --git a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml index c641e75..71cf4c2 100644 --- a/JAVA_MYSQL_WEBSITE/.idea/workspace.xml +++ b/JAVA_MYSQL_WEBSITE/.idea/workspace.xml @@ -5,18 +5,7 @@ - - - - - - - - - - -