From 350267802d21cab53d5ec2c39e404d5649be3524 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 06 一月 2026 10:27:47 +0800
Subject: [PATCH] 修改发票功能
---
service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
index 15a08ad..675ba4e 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/InvoiceManageServiceImpl.java
@@ -1,11 +1,14 @@
package com.ruoyi.cwgl.service.impl;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.InvoiceDetail;
import org.springframework.transaction.annotation.Transactional;
@@ -108,7 +111,6 @@
* @param invoiceManage 鍙戠エ绠＄悊
* @return 缁撴灉
*/
- @Transactional
@Override
public int insertInvoiceManage(InvoiceManage invoiceManage)
{
@@ -156,8 +158,8 @@
public int updateInvoiceManage(InvoiceManage invoiceManage)
{
invoiceManage.setUpdateTime(DateUtils.getNowDate());
-// invoiceManageMapper.deleteInvoiceDetailByInvoiceManageId(invoiceManage.getId());
-// insertInvoiceDetail(invoiceManage);
+ invoiceManageMapper.deleteInvoiceDetailByInvoiceManageId(invoiceManage.getId());
+ insertInvoiceDetail(invoiceManage);
int rows = invoiceManageMapper.updateInvoiceManage(invoiceManage);
// 璁板綍淇敼鍙戠エ绠＄悊鏃ュ織
@@ -245,6 +247,7 @@
for (InvoiceDetail invoiceDetail : invoiceDetailList)
{
invoiceDetail.setInvoiceManageId(id);
+ invoiceDetail.setCreateTime(new Date());
list.add(invoiceDetail);
}
if (list.size() > 0)
@@ -265,7 +268,7 @@
try {
InvoiceManageLog log = new InvoiceManageLog();
log.setInvoiceManageId(invoiceManage.getId());
- log.setOperator(invoiceManage.getCreateBy());
+ log.setOperator(SecurityUtils.getUsername());
log.setOperationTime(DateUtils.getNowDate());
// 鏋勫缓鎿嶄綔鎻忚堪锛屽寘鍚紑绁ㄩ噾棰濄�佸叧鑱旇处鍗曠紪鍙峰拰瀵瑰簲寮�绁ㄩ噾棰�
@@ -298,4 +301,54 @@
logger.error("璁板綍鍙戠エ绠＄悊鎿嶄綔鏃ュ織澶辫触: {}", e.getMessage());
}
}
+
+ @Override
+ public AjaxResult applyInvoice(Integer id) {
+
+ return AjaxResult.success("鐢宠寮�绁ㄦ垚鍔�");
+ }
+
+ /**
+ * 璁板綍鐢宠寮�绁ㄦ棩蹇�
+ *
+ * @param invoiceManage 鍙戠エ绠＄悊瀵硅薄
+ */
+ private void recordApplyInvoiceLog(InvoiceManage invoiceManage)
+ {
+ try {
+ InvoiceManageLog log = new InvoiceManageLog();
+ log.setInvoiceManageId(invoiceManage.getId());
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(new java.util.Date());
+
+ // 鏋勫缓鎿嶄綔鎻忚堪锛屽寘鍚紑绁ㄩ噾棰濄�佸叧鑱旇处鍗曠紪鍙峰拰瀵瑰簲寮�绁ㄩ噾棰�
+ StringBuilder descBuilder = new StringBuilder();
+ descBuilder.append("鐢宠寮�绁�: ");
+
+ if (invoiceManage.getInvoiceAmount() != null) {
+ descBuilder.append("寮�绁ㄩ噾棰�=").append(invoiceManage.getInvoiceAmount()).append("; ");
+ }
+
+ // 鑾峰彇鍏宠仈璐﹀崟淇℃伅
+ if (invoiceManage.getInvoiceDetailList() != null && !invoiceManage.getInvoiceDetailList().isEmpty()) {
+ descBuilder.append("鍏宠仈璐﹀崟淇℃伅: ");
+ for (com.ruoyi.cwgl.domain.InvoiceDetail detail : invoiceManage.getInvoiceDetailList()) {
+ if (detail.getReceivableBillNo() != null) {
+ descBuilder.append("璐﹀崟缂栧彿=").append(detail.getReceivableBillNo());
+ }
+ if (detail.getCurrentBilledAmount() != null) {
+ descBuilder.append(", 鏈寮�绁ㄩ噾棰�=").append(detail.getCurrentBilledAmount());
+ }
+ descBuilder.append("; ");
+ }
+ }
+
+ log.setOperationDesc(descBuilder.toString());
+ log.setCreateTime(new java.util.Date());
+
+ invoiceManageLogService.insertInvoiceManageLog(log);
+ } catch (Exception e) {
+ logger.error("璁板綍鐢宠寮�绁ㄦ棩蹇楀け璐�: {}", e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0