diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index d74fdd63..be80e01a 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -1,7 +1,5 @@ package com.xhpc.invoice.service.impl; -import cn.hutool.extra.mail.MailUtil; -import cn.hutool.http.HttpUtil; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.ExcelWriter; import com.xhpc.common.core.utils.DateUtils; @@ -23,7 +21,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; @@ -129,20 +126,20 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { //发送电子发票pdf到接收者邮箱 XhpcInvoice xhpcInvoice = xhpcInvoiceMapper.selectByPrimaryKey(requestData.getInvoiceId()); String receiveEmail = xhpcInvoice.getReceiveEmail(); - //从阿里云上下载下来电子发票 - String fileUrl = requestData.getEletricInvoiceUrl(); - File electricInvoiceFile = new File(environment.getProperty("file.serverStoreDisposableFileLocation") + "ElectricInvoice.pdf"); - HttpUtil.downloadFile(fileUrl, electricInvoiceFile); - try { - MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); - } catch (Exception e) { - System.out.println(e.getMessage()); - return Boolean.FALSE; - } finally { - if (electricInvoiceFile.exists()) { - electricInvoiceFile.delete(); - } - } +// //从阿里云上下载下来电子发票 +// String fileUrl = requestData.getEletricInvoiceUrl(); +// File electricInvoiceFile = new File(environment.getProperty("file.serverStoreDisposableFileLocation") + "ElectricInvoice.pdf"); +// HttpUtil.downloadFile(fileUrl, electricInvoiceFile); +// try { +// MailUtil.send(receiveEmail, "【小华充电】电子发票", "邮件来自小华充电", false, electricInvoiceFile); +// } catch (Exception e) { +// System.out.println(e.getMessage()); +// return Boolean.FALSE; +// } finally { +// if (electricInvoiceFile.exists()) { +// electricInvoiceFile.delete(); +// } +// } //更新发票数据,并设置用户未阅读状态 Long successFlag = xhpcInvoiceMapper.invoiceToUser(requestData); if (successFlag == 0) { @@ -561,7 +558,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { writer.addHeaderAlias("titleContent", "抬头内容"); writer.addHeaderAlias("dutyNumber", "税号"); writer.addHeaderAlias("invoiceContent", "发票内容"); - writer.addHeaderAlias("invoiceOrderElectricTotalMoney", "总电量金额"); + writer.addHeaderAlias("invoiceMoney", "发票总金额"); writer.addHeaderAlias("invoiceOrderServiceTotalMoney", "总服务费金额"); writer.addHeaderAlias("firmAddress", "地址"); writer.addHeaderAlias("firmPhone", "电话号码"); diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml index 1c3495ec..9bce4773 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml @@ -197,41 +197,41 @@ AND creator_type = #{creatorType}