Commit 78557bcc authored by hanfeng's avatar hanfeng

开票

parent 019e2e45
...@@ -86,7 +86,7 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> { ...@@ -86,7 +86,7 @@ public class InvoiceController extends BaseController<InvoiceBiz, Invoice> {
// invoiceVo.setCreateBy(infoFromToken.getName()); // invoiceVo.setCreateBy(infoFromToken.getName());
try { try {
String invoicing = baseBiz.Invoicing(invoiceVo,request); String invoicing = baseBiz.Invoicing(invoiceVo);
return ObjectRestResponse.succ(invoicing); return ObjectRestResponse.succ(invoicing);
} catch (BaseException e) { } catch (BaseException e) {
log.error("开票错误信息={}", e); log.error("开票错误信息={}", e);
......
...@@ -107,11 +107,10 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> { ...@@ -107,11 +107,10 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* 开票 * 开票
* *
* @param invoiceVo * @param invoiceVo
* @param request
* @return * @return
* @throws Exception * @throws Exception
*/ */
public String Invoicing(InvoiceVo invoiceVo, HttpServletRequest request) throws Exception { public String Invoicing(InvoiceVo invoiceVo) throws Exception {
//没有填写邮箱不需要进行推送 //没有填写邮箱不需要进行推送
if (StringUtils.isBlank(invoiceVo.getPurchaserEmail())) { if (StringUtils.isBlank(invoiceVo.getPurchaserEmail())) {
pushMode = -1; pushMode = -1;
...@@ -140,7 +139,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> { ...@@ -140,7 +139,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
//调用第三方开票 //调用第三方开票
String invoiceSerialNum = invoiceDao.Invoicing(invoice, orders); String invoiceSerialNum = invoiceDao.Invoicing(invoice, orders);
insertInvoic(invoice, invoiceSerialNum, orders,request); insertInvoic(invoice, invoiceSerialNum, orders);
return invoiceSerialNum; return invoiceSerialNum;
} }
...@@ -152,7 +151,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> { ...@@ -152,7 +151,7 @@ public class InvoiceBiz extends BaseBiz<InvoiceMapper, Invoice> {
* @param orders * @param orders
* @throws Exception * @throws Exception
*/ */
public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders,HttpServletRequest request) throws Exception { public void insertInvoic(Invoice invoice, String invoiceSerialNum, List<OrderData> orders) throws Exception {
invoice.setInvoiceSerialNum(invoiceSerialNum); invoice.setInvoiceSerialNum(invoiceSerialNum);
BigDecimal taxExcludedAmount = BigDecimal.ZERO; BigDecimal taxExcludedAmount = BigDecimal.ZERO;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment