From c62cee9d60f0e7dbc319b410f28397ef4ff759f3 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 22 十二月 2025 15:59:49 +0800
Subject: [PATCH] 应收费用日志
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
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 a5ed886..7e7c7ef 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
@@ -78,7 +78,15 @@
@Override
public ReceivableFeeManagement selectReceivableFeeManagementById(Integer id)
{
- return receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ ReceivableFeeManagement receivableFeeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ if (receivableFeeManagement != null) {
+ // 鏌ヨ瀵瑰簲鐨勮垂鐢ㄦ槑缁�
+ ReceivableFeeDetail detail = new ReceivableFeeDetail();
+ detail.setReceivableFeeId(id);
+ List<ReceivableFeeDetail> detailList = receivableFeeDetailService.selectReceivableFeeDetailList(detail);
+ receivableFeeManagement.setReceivableFeeDetailList(detailList);
+ }
+ return receivableFeeManagement;
}
/**
@@ -183,7 +191,29 @@
public int updateReceivableFeeManagement(ReceivableFeeManagement receivableFeeManagement)
{
receivableFeeManagement.setUpdateTime(DateUtils.getNowDate());
- return receivableFeeManagementMapper.updateReceivableFeeManagement(receivableFeeManagement);
+
+ // 1. 鏇存柊涓昏〃淇℃伅
+ int result = receivableFeeManagementMapper.updateReceivableFeeManagement(receivableFeeManagement);
+
+ // 2. 鑾峰彇涓昏〃ID
+ Integer receivableFeeId = receivableFeeManagement.getId();
+
+ // 3. 鍒犻櫎璇ュ簲鏀惰垂鐢ㄤ笅鐨勬墍鏈夌幇鏈夋槑缁�
+ receivableFeeDetailService.deleteReceivableFeeDetailByReceivableFeeId(receivableFeeId);
+
+ // 4. 鎵归噺淇濆瓨鏂扮殑鏄庣粏鍒楄〃
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ // 璁剧疆姣忎釜鏄庣粏鐨勫簲鏀惰垂鐢ㄧ鐞咺D
+ receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
+ detail.setReceivableFeeId(receivableFeeId);
+ detail.setUpdateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+ });
+
+ // 璋冪敤鎵归噺鎻掑叆鏂规硶
+ receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
+ }
+
+ return result;
}
/**
@@ -272,9 +302,7 @@
BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
BigDecimal totalAmountHkd = totalReceivableAmount.divide(exchangeRate, 2, RoundingMode.HALF_UP);
- // 鏌ヨ搴旀敹璐圭敤鏄庣粏
- List<ReceivableFeeDetail> detailList = receivableFeeDetailService.selectReceivableFeeDetailByReceivableFeeIds(ids);
-
+
// 缁勮杩斿洖缁撴灉
ReceivableFeeStatisticsVo result = new ReceivableFeeStatisticsVo();
result.setDocumentCount(documentCount);
@@ -282,7 +310,6 @@
result.setTotalReceivableAmount(totalReceivableAmount);
result.setTotalAmountRmb(totalReceivableAmount);
result.setTotalAmountHkd(totalAmountHkd);
- result.setDetailList(detailList);
result.setIds(ids);
return result;
@@ -304,9 +331,12 @@
ReceivableBillManagement billManagement = new ReceivableBillManagement();
billManagement.setDocumentCount(statisticsVo.getDocumentCount());
billManagement.setExchangeRate(statisticsVo.getRate());
- billManagement.setStatus("DRAFT"); // 榛樿鑽夌鐘舵��
+ billManagement.setStatus("0"); // 榛樿鑽夌鐘舵��
billManagement.setCreateTime(DateUtils.getNowDate());
-
+ billManagement.setBillName(billCreateVo.getBillName());
+ billManagement.setCustomerName(billCreateVo.getCustomerName());
+ billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
+ billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
// 3. 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
if (billType == 0) {
// 浜烘皯甯佽处鍗�
@@ -319,7 +349,8 @@
} else {
throw new IllegalArgumentException("鏃犳晥鐨勮处鍗曠被鍨嬶細" + billType);
}
-
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
+ billManagement.setSystemNo(noByKey);
// 4. 淇濆瓨涓昏处鍗曡褰�
int i = receivableBillManagementService.insertReceivableBillManagement(billManagement);
@@ -329,16 +360,16 @@
String billSystemNo = billManagement.getSystemNo();
// 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
- List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
for (Integer feeId : statisticsVo.getIds()) {
ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
feeManagement.setId(feeId);
feeManagement.setRelatedBillNo(billSystemNo);
- feeManagements.add(feeManagement);
+ feeManagement.setStatus("1");
+ receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
}
// 璋冪敤鎵归噺鏇存柊鏂规硶
- updateReceivableFeeManagementBatch(feeManagements);
+
}
return i;
--
Gitblit v1.8.0