From 5fa6e6f8410ef9d057174bcff2a3c5038c54a551 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 27 四月 2025 18:41:20 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
index c602c6b..1fbb4db 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
@@ -1,24 +1,23 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.system.mapper.TInvoiceMapper;
-import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TInvoice;
-import com.ruoyi.system.model.TInvoiceToBill;
import com.ruoyi.system.query.TInvoiceQuery;
-import com.ruoyi.system.query.TInvoiceToBillQuery;
import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TInvoiceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.org.apache.regexp.internal.RE;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
-import java.util.ArrayList;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
/**
* <p>
@@ -34,6 +33,8 @@
TInvoiceToBillServiceImpl tInvoiceToBillService;
@Autowired
TBillService tBillService;
+ @Resource
+ TencentMailUtil mailUtil;
@Override
public PageInfo<TInvoice> pageList(TInvoiceQuery query) {
@@ -52,20 +53,36 @@
.eq(null != query.getStatus(),TInvoice::getStatus,query.getStatus())
.ge(StringUtils.isNotEmpty(query.getInvoiceStartTime()),TInvoice::getInvoiceTime,query.getInvoiceStartTime())
.le(StringUtils.isNotEmpty(query.getInvoiceEndTime()),TInvoice::getInvoiceTime,query.getInvoiceEndTime())
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& ! "0".equals(query.getBusinessDeptId()),TInvoice::getBusinessDeptId,query.getBusinessDeptId())
.orderByDesc(TInvoice::getCreateTime);
return this.baseMapper.selectList(queryWrapper);
}
@Override
- public List<TBill> getBillByInvoiceId( String invoiceId){
- ArrayList<TBill> bills = new ArrayList<>();
- TInvoiceToBillQuery query = new TInvoiceToBillQuery();
- query.setInvoiceId(invoiceId);
- List<TInvoiceToBill> tInvoiceToBills = tInvoiceToBillService.makeQuery(query);
- for (TInvoiceToBill tInvoiceToBill : tInvoiceToBills) {
- TBill byId = tBillService.getById(tInvoiceToBill.getBillId());
- bills.add(byId);
+ public Boolean uploadVoucher(TInvoiceQuery query, List<Map<String, String>> map) {
+ // 检查是否存在对应的发票记录
+ TInvoice preexist = getById(query.getId());
+ if (preexist == null) {
+ log.error("未找到对应的发票记录，ID: {}"+query.getId());
+ return false;
}
- return bills;
+
+ // 更新发票信息
+ TInvoice tInvoice = new TInvoice();
+ tInvoice.setId(query.getId());
+ tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
+ tInvoice.setInvoiceTime(query.getInvoiceTime());
+ tInvoice.setStatus(2);
+ // 异步发送邮件
+ CompletableFuture.runAsync(() -> {
+ try {
+ mailUtil.sendInvoice(preexist.getEmail(), map);
+ } catch (ServiceException e) {
+ log.error("邮件发送失败", e);
+ }
+ });
+ // 更新数据库
+ return updateById(tInvoice);
}
}
--
Gitblit v1.7.1