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 | 70 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 25 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 5637f6c..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,19 +3,21 @@
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;
@@ -53,7 +55,11 @@
@Resource
private TOrderInvoiceService orderInvoiceService;
-
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+
@ResponseBody
@@ -62,37 +68,31 @@
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")
- @ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
- public AjaxResult<String> uploadPdf(@RequestParam("id") Long id,
- @RequestParam("invoiceUrl") String invoiceUrl){
- TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
- orderInvoice.setInvoiceUrl(invoiceUrl);
- orderInvoice.setStatus(3);
- orderInvoiceService.updateById(orderInvoice);
+
+ public static void main(String[] args) {
// 发送邮箱
// 收件人电子邮箱,TODO 换成自己的收件箱
- String to = orderInvoice.getMailbox();
+ String to = "443237572@qq.com";
// 发件人电子邮箱,TODO 换成自己的发件箱
String from = "13281306557@163.com";
// 指定发送邮件的主机为
String host = "smtp.163.com";
- // 获取系统属性
Properties properties = new Properties();
- // 设置邮件服务器
- properties.setProperty("mail.smtp.host", host);
- // 邮件发送协议
- properties.setProperty("mail.transport.protocol", "smtp");
- //是否启用调试模式（启用调试模式可打印客户端与服务器交互过程时一问一答的响应消息）
- properties.setProperty("mail.debug","true");
- properties.setProperty("mail.smtp.auth", "true");
+ 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
@@ -134,7 +134,7 @@
// 组装附件
MimeBodyPart filePart = new MimeBodyPart();
- String imageUrl = invoiceUrl;
+ String imageUrl = "https://mxcd.zhinenganguan.com/file/2025-02-14/_1@2x.png";
try {
// 下载数据
URL url = new URL(imageUrl);
@@ -173,9 +173,23 @@
} catch (Exception e) {
e.printStackTrace();
}
+ }
+
+ @RequiresPermissions(value = {"/invoiceManagement/accept_hear_case"}, logical = Logical.OR)
+ @PostMapping("/uploadPdf")
+ @ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
+ 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){
@@ -185,6 +199,7 @@
/**
* 发票管理导出
*/
+ @RequiresPermissions(value = {"/invoiceManagement/export"}, logical = Logical.OR)
@ApiOperation(value = "发票管理导出", tags = {"管理后台-发票管理"})
@Log(title = "发票管理导出", businessType = BusinessType.EXPORT)
@PutMapping("/export")
@@ -238,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