From 9c0bfff1512e53dc810b1b227310ea89b4cddf01 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 四月 2025 15:27:22 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 65db90f..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,9 +1,23 @@
package com.ruoyi.system.service.impl;
-import com.ruoyi.system.mapper.TInvoiceMapper;
-import com.ruoyi.system.service.TInvoiceService;
+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.TInvoice;
+import com.ruoyi.system.query.TInvoiceQuery;
+import com.ruoyi.system.service.TBillService;
+import com.ruoyi.system.service.TInvoiceService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,5 +29,60 @@
*/
@Service
public class TInvoiceServiceImpl extends ServiceImpl<TInvoiceMapper, TInvoice> implements TInvoiceService {
+ @Autowired
+ TInvoiceToBillServiceImpl tInvoiceToBillService;
+ @Autowired
+ TBillService tBillService;
+ @Resource
+ TencentMailUtil mailUtil;
+ @Override
+ public PageInfo<TInvoice> pageList(TInvoiceQuery query) {
+ PageInfo<TInvoice> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TInvoice> list = makeQuery(query);
+ pageInfo.setRecords(list);
+ pageInfo.setTotal(list.size());
+ return pageInfo;
+ }
+
+ @Override
+ public List<TInvoice> makeQuery(TInvoiceQuery query) {
+ LambdaQueryWrapper<TInvoice> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(null != query.getTitleType(),TInvoice::getTitleType,query.getTitleType())
+ .like(StringUtils.isNotEmpty(query.getTitleName()),TInvoice::getTitleName,query.getTitleName())
+ .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 Boolean uploadVoucher(TInvoiceQuery query, List<Map<String, String>> map) {
+ // 检查是否存在对应的发票记录
+ TInvoice preexist = getById(query.getId());
+ if (preexist == null) {
+ log.error("未找到对应的发票记录，ID: {}"+query.getId());
+ return false;
+ }
+
+ // 更新发票信息
+ 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