From 67d06a785d5fc4524639ace27651c01ff05a4b58 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 五月 2025 22:31:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 153 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 137 insertions(+), 16 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
index 1b2dfc4..9ff2e17 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -3,35 +3,41 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.ruoyi.account.api.dto.UploadPdfDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.model.TOrderInvoice;
import com.ruoyi.order.api.query.TOrderInvoiceQuery;
import com.ruoyi.order.api.vo.TOrderInvoiceVO;
-import com.ruoyi.order.dto.AddOrderInvoice;
-import com.ruoyi.order.dto.GetOrderInvoiceList;
-import com.ruoyi.order.dto.MyOrderInvoiceInfo;
-import com.ruoyi.order.dto.OrderInvoiceList;
+import com.ruoyi.order.dto.*;
import com.ruoyi.order.export.OrderInvoiceExport;
import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.IOUtils;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
import javax.annotation.Resource;
+import javax.mail.*;
+import javax.mail.internet.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
+import java.io.*;
+import java.net.URL;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -49,7 +55,11 @@
@Resource
private TOrderInvoiceService orderInvoiceService;
-
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+
@ResponseBody
@@ -58,23 +68,128 @@
public AjaxResult addOrderInvoice(@RequestBody AddOrderInvoice addOrderInvoice){
return orderInvoiceService.addOrderInvoice(addOrderInvoice);
}
-
+
+
+ @RequiresPermissions(value = {"/invoiceManagement"}, logical = Logical.OR)
@PostMapping("/pageList")
@ApiOperation(value = "查询开票分页列表", tags = {"管理后台-发票管理"})
public AjaxResult<PageInfo<TOrderInvoiceVO>> pageList(@RequestBody TOrderInvoiceQuery query){
return AjaxResult.success(orderInvoiceService.pageList(query));
}
- @GetMapping("/uploadPdf")
+
+ public static void main(String[] args) {
+ // 发送邮箱
+ // 收件人电子邮箱,TODO 换成自己的收件箱
+ String to = "443237572@qq.com";
+ // 发件人电子邮箱,TODO 换成自己的发件箱
+ String from = "13281306557@163.com";
+ // 指定发送邮件的主机为
+ String host = "smtp.163.com";
+ Properties properties = new Properties();
+ properties.put("mail.smtp.host", "smtp.163.com");
+ properties.put("mail.smtp.socketFactory.port", "465");
+ properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.put("mail.smtp.auth", "true");
+ properties.put("mail.smtp.port", "465");
+ properties.put("mail.smtp.ssl.enable", "true"); // 明确开启SSL
+ // 获取默认session对象
+ Session session = Session.getDefaultInstance(properties,new Authenticator(){
+ @Override
+ public PasswordAuthentication getPasswordAuthentication()
+ {
+ //发件人邮件用户名、授权码，换成自己的发件箱及授权码
+ return new PasswordAuthentication("13281306557@163.com", "NUSdxDQqadYvVek2");
+ }
+ });
+
+ try{
+ // 创建默认的 MimeMessage 对象
+ MimeMessage message = new MimeMessage(session);
+ // Set From，设置发件人
+ InternetAddress fromMail = new InternetAddress(from);
+ //设置发件人名称，TODO 换成自己的发件箱
+ fromMail.setPersonal(MimeUtility.encodeText("明星电力<13281306557@163.com>"));
+ message.setFrom(fromMail);
+ // Set To: 设置收件人
+ InternetAddress toMail = new InternetAddress(to);
+ // TODO 换成自己的收件箱
+ InternetAddress toMail2 = new InternetAddress(to);
+ //发多个邮箱
+ Address[] allRecipients = {toMail, toMail2};
+ message.setRecipients(Message.RecipientType.TO, allRecipients);
+ // Set Subject: 邮件主体
+ message.setSubject("明星电力");
+ // 设置消息体
+ message.setSentDate(new Date());
+ // 指定为混合关系
+ MimeMultipart msgMultipart = new MimeMultipart("mixed");
+ message.setContent(msgMultipart);
+ // 邮件信息组装
+ //组装的顺序非常重要，一定要先组装文本域，再组装文件
+ MimeBodyPart htmlPart = new MimeBodyPart();
+ // 组装内容
+ htmlPart.setContent("开票", "text/html;charset=UTF-8");
+ msgMultipart.addBodyPart(htmlPart);
+
+ // 组装附件
+ MimeBodyPart filePart = new MimeBodyPart();
+ String imageUrl = "https://mxcd.zhinenganguan.com/file/2025-02-14/_1@2x.png";
+ try {
+ // 下载数据
+ URL url = new URL(imageUrl);
+ InputStream inputStream = url.openStream();
+ byte[] imageBytes = IOUtils.toByteArray(inputStream);
+
+ // 创建临时文件
+ // 截取imageUrl后缀名
+ String fileExtension = imageUrl.substring(imageUrl.lastIndexOf("."));
+ File tempFile = File.createTempFile("tempImage", fileExtension);
+ try (FileOutputStream fos = new FileOutputStream(tempFile)) {
+ fos.write(imageBytes);
+ }
+
+ // 创建 FileDataSource
+ FileDataSource fileDataSource = new FileDataSource(tempFile);
+ System.out.println("FileDataSource created: " + fileDataSource.getName());
+ // 如果需要，可以使用 DataHandler 进行进一步处理
+ DataHandler dh = new DataHandler(fileDataSource);
+ // 清理：删除临时文件（如果不再需要）
+ tempFile.deleteOnExit(); // 可根据需要保留或删除
+ filePart.setDataHandler(dh);
+ // 附件区别内嵌内容的一个特点是有文件名，为防止中文乱码要编码
+ filePart.setFileName(MimeUtility.encodeText(dh.getName()));
+ msgMultipart.addBodyPart(filePart);
+ message.saveChanges();
+ //发送
+ //Transport.send(message, message.getAllRecipients());
+ Transport.send(message);
+ System.out.println("发送成功");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }catch (MessagingException | UnsupportedEncodingException mex) {
+ mex.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @RequiresPermissions(value = {"/invoiceManagement/accept_hear_case"}, logical = Logical.OR)
+ @PostMapping("/uploadPdf")
@ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
- public AjaxResult<String> uploadPdf(@RequestParam("id") Long id,
- @RequestParam("invoiceUrl") String invoiceUrl){
- TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
- orderInvoice.setInvoiceUrl(invoiceUrl);
+ public AjaxResult<String> uploadPdf(@RequestBody UploadPdfDTO dto){
+ TOrderInvoice orderInvoice = orderInvoiceService.getById(dto.getId());
+ orderInvoice.setInvoiceUrl(dto.getInvoiceUrl());
+ orderInvoice.setStatus(3);
orderInvoiceService.updateById(orderInvoice);
+ dto.setMailBox(orderInvoice.getMailbox());
+ appUserClient.uploadPdf(dto);
return AjaxResult.success();
}
-
+
+
+ @RequiresPermissions(value = {"/invoiceManagement"}, logical = Logical.OR)
@PostMapping("/statusCount")
@ApiOperation(value = "查询开票状态数量", tags = {"管理后台-发票管理"})
public AjaxResult<Map<String,Integer>> statusCount(@RequestBody TOrderInvoiceQuery query){
@@ -84,6 +199,7 @@
/**
* 发票管理导出
*/
+ @RequiresPermissions(value = {"/invoiceManagement/export"}, logical = Logical.OR)
@ApiOperation(value = "发票管理导出", tags = {"管理后台-发票管理"})
@Log(title = "发票管理导出", businessType = BusinessType.EXPORT)
@PutMapping("/export")
@@ -137,6 +253,11 @@
@GetMapping("/getMyOrderInvoiceInfo/{id}")
@ApiOperation(value = "获取开票记录详情", tags = {"小程序-充电发票"})
public AjaxResult<MyOrderInvoiceInfo> getMyOrderInvoiceInfo(@PathVariable String id){
+ TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!orderInvoice.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
MyOrderInvoiceInfo myOrderInvoiceInfo = orderInvoiceService.getMyOrderInvoiceInfo(id);
return AjaxResult.success(myOrderInvoiceInfo);
}
--
Gitblit v1.7.1