From 1e2e31c3b3fe3460763b941a2341ff03ce3eb705 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 18 十二月 2025 09:46:21 +0800
Subject: [PATCH] 新增费用接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 25 ++++++++++++++++++++++++-
service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagement.java | 7 ++++++-
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java | 20 +++++++++++++++++++-
service/src/main/java/com/ruoyi/cwgl/domain/PayableFeeManagement.java | 6 ++++--
4 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/PayableFeeManagement.java b/service/src/main/java/com/ruoyi/cwgl/domain/PayableFeeManagement.java
index 7e00c10..0f5bb17 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/PayableFeeManagement.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/PayableFeeManagement.java
@@ -1,11 +1,10 @@
package com.ruoyi.cwgl.domain;
-import java.math.BigDecimal;
+import java.util.List;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
import lombok.Data;
/**
* 搴斾粯璐圭敤绠＄悊瀵硅薄 payable_fee_management
@@ -156,5 +155,8 @@
@TableField("deleted")
private Integer deleted;
+ /** 搴斾粯璐圭敤鏄庣粏鍒楄〃 */
+ @TableField(exist = false)
+ private List<PayableFeeDetail> payableFeeDetailList;
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagement.java b/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagement.java
index 9f15bad..89ef8a6 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagement.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagement.java
@@ -2,10 +2,11 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
+import com.ruoyi.cwgl.domain.ReceivableFeeDetail;
import lombok.Data;
/**
* 搴旀敹璐圭敤绠＄悊瀵硅薄 receivable_fee_management
@@ -156,5 +157,9 @@
@TableField("deleted")
private Integer deleted;
+ /** 搴旀敹璐圭敤鏄庣粏鍒楄〃 */
+ @TableField(exist = false)
+ private List<ReceivableFeeDetail> receivableFeeDetailList;
+
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
index 713e5a8..b45b7d3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java
@@ -18,6 +18,7 @@
import com.ruoyi.cwgl.mapper.PayableFeeManagementMapper;
import com.ruoyi.cwgl.domain.PayableFeeManagement;
import com.ruoyi.cwgl.service.IPayableFeeManagementService;
+import com.ruoyi.cwgl.service.IPayableFeeDetailService;
import com.ruoyi.common.core.text.Convert;
/**
@@ -33,6 +34,9 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private PayableFeeManagementMapper payableFeeManagementMapper;
+
+ @Resource
+ private IPayableFeeDetailService payableFeeDetailService;
/**
@@ -103,7 +107,21 @@
public int insertPayableFeeManagement(PayableFeeManagement payableFeeManagement)
{
payableFeeManagement.setCreateTime(DateUtils.getNowDate());
- return payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
+
+ // 淇濆瓨涓诲疄浣�
+ int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
+ Integer payableFeeId = payableFeeManagement.getId();
+
+ // 鎵归噺淇濆瓨鏄庣粏
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
+ detail.setPayableFeeId(payableFeeId);
+ detail.setCreateTime(DateUtils.getNowDate());
+ });
+ payableFeeDetailService.insertPayableFeeDetailBatch(payableFeeManagement.getPayableFeeDetailList());
+ }
+
+ return result;
}
/**
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 73ced5b..89d9b1a 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -17,6 +17,7 @@
import com.ruoyi.cwgl.mapper.ReceivableFeeManagementMapper;
import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
+import com.ruoyi.cwgl.service.IReceivableFeeDetailService;
import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
import com.ruoyi.common.core.text.Convert;
@@ -33,6 +34,9 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private ReceivableFeeManagementMapper receivableFeeManagementMapper;
+
+ @Autowired
+ private IReceivableFeeDetailService receivableFeeDetailService;
/**
@@ -103,7 +107,26 @@
public int insertReceivableFeeManagement(ReceivableFeeManagement receivableFeeManagement)
{
receivableFeeManagement.setCreateTime(DateUtils.getNowDate());
- return receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
+
+ // 淇濆瓨涓昏〃淇℃伅
+ int result = receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
+
+ // 鑾峰彇涓昏〃ID
+ Integer receivableFeeId = receivableFeeManagement.getId();
+
+ // 鎵归噺淇濆瓨鏄庣粏鍒楄〃
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ // 璁剧疆姣忎釜鏄庣粏鐨勫簲鏀惰垂鐢ㄧ鐞咺D
+ receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
+ detail.setReceivableFeeId(receivableFeeId);
+ detail.setCreateTime(DateUtils.getNowDate()); // 璁剧疆鍒涘缓鏃堕棿
+ });
+
+ // 璋冪敤鎵归噺鎻掑叆鏂规硶
+ receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
+ }
+
+ return result;
}
/**
--
Gitblit v1.8.0