From 74889d0d4bc08d92cb1c2c33d2e01e0885b4c8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Wed, 10 Jul 2024 10:54:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=82=AE=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserInvoiceController.java | 20 +++++++++++++++++++ .../gxwebsoft/booking/entity/UserInvoice.java | 9 +++++++++ .../system/service/EmailRecordService.java | 1 + .../service/impl/EmailRecordServiceImpl.java | 14 +++++++++++++ 4 files changed, 44 insertions(+) diff --git a/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java b/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java index ada8d54..fcd5b00 100644 --- a/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java +++ b/src/main/java/com/gxwebsoft/booking/controller/UserInvoiceController.java @@ -15,6 +15,7 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.EmailRecordService; import com.gxwebsoft.shop.entity.Order; import com.gxwebsoft.shop.service.OrderService; import io.swagger.annotations.Api; @@ -22,10 +23,15 @@ import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import nuonuo.open.sdk.NNOpenSDK; import org.apache.poi.ss.formula.functions.T; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.HashMap; @@ -46,6 +52,8 @@ public class UserInvoiceController extends BaseController { private UserInvoiceService userInvoiceService; @Resource private OrderService orderService; + @Resource + private EmailRecordService emailRecordService; @ApiOperation("分页查询发票") @GetMapping("/page") @@ -197,6 +205,8 @@ public class UserInvoiceController extends BaseController { orderInfo.setInvoiceNo(invoiceSerialNum); System.out.println("invoiceSerialNum = " + invoiceSerialNum); orderService.updateById(orderInfo); + invoice.setInvoiceNo(invoiceSerialNum); + userInvoiceService.updateById(invoice); return success("发票开具成功", json); } } @@ -230,6 +240,16 @@ public class UserInvoiceController extends BaseController { return success("查询成功", result); } +// @ApiOperation("发送到邮箱") +// @GetMapping("/showInvoice/send/{pdfUrl}") +// public ApiResult sendInvoice(@PathVariable("pdfUrl") String pdfUrl) { +// // 发送邮件通知 +// String title = "发票凭证"; +// // 发送邮件通知 +// emailRecordService.sendEmail(title, pdfUrl, "ip170@163.com"); +// +// } + // @ApiOperation("开具发票") // @GetMapping("/doInvoice/{id}") // public ApiResult doInvoice(@PathVariable("id") Integer id) { diff --git a/src/main/java/com/gxwebsoft/booking/entity/UserInvoice.java b/src/main/java/com/gxwebsoft/booking/entity/UserInvoice.java index 89fc362..5d88610 100644 --- a/src/main/java/com/gxwebsoft/booking/entity/UserInvoice.java +++ b/src/main/java/com/gxwebsoft/booking/entity/UserInvoice.java @@ -61,6 +61,15 @@ public class UserInvoice implements Serializable { @ApiModelProperty(value = "电子邮箱") private String email; + @ApiModelProperty(value = "发票流水号") + private String invoiceNo; + + @ApiModelProperty(value = "发票预览图片") + private String invoiceImg; + + @ApiModelProperty(value = "发票pdf地址") + private String invoicePdf; + @ApiModelProperty(value = "备注") private String comments; diff --git a/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java index 6b100c7..b99a195 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/EmailRecordService.java @@ -47,4 +47,5 @@ public interface EmailRecordService extends IService { void sendHtmlEmail(String title, String path, Map map, String[] toEmails) throws MessagingException, IOException; + void sendEmail(String title, String content, String receiver); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java index a939a3d..13ecae2 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/EmailRecordServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -69,4 +70,17 @@ public class EmailRecordServiceImpl extends ServiceImpl