From 84897f28662a94a6caec972c543538c2c9fdf0f5 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 11:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 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 866fc93..a5ed886 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
@@ -2,8 +2,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
+import com.ruoyi.common.enums.SystemDataNoEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
@@ -11,6 +15,7 @@
import com.ruoyi.cwgl.domain.vo.ReceivableFeeStatisticsVo;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.service.ISystemDataNoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
@@ -60,6 +65,8 @@
@Autowired
private IReceivableBillSettlementDetailService receivableBillSettlementDetailService;
+ @Autowired
+ ISystemDataNoService systemDataNoService;
/**
* 鏌ヨ搴旀敹璐圭敤绠＄悊
@@ -129,7 +136,9 @@
public int insertReceivableFeeManagement(ReceivableFeeManagement receivableFeeManagement)
{
receivableFeeManagement.setCreateTime(DateUtils.getNowDate());
-
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YS);
+ receivableFeeManagement.setSystemNo(noByKey);
+
// 淇濆瓨涓昏〃淇℃伅
int result = receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
@@ -238,6 +247,17 @@
// 鏌ヨ搴旀敹璐圭敤涓昏〃璁板綍
List<ReceivableFeeManagement> receivableFeeList = receivableFeeManagementMapper.selectReceivableFeeManagementByIds(ids);
+ // 妫�鏌ユ墍鏈夎褰曟槸鍚﹀睘浜庡悓涓�涓鎴�
+ if (!receivableFeeList.isEmpty()) {
+ Integer firstCustomerId = receivableFeeList.get(0).getCustomerId();
+ boolean allSameCustomer = receivableFeeList.stream()
+ .allMatch(item -> Objects.equals(item.getCustomerId(), firstCustomerId));
+
+ if (!allSameCustomer) {
+ throw new ServiceException("鎵�閫夎褰曞寘鍚笉鍚屽鎴风殑鏁版嵁锛屾棤娉曡繘琛岀粺璁�");
+ }
+ }
+
// 璁＄畻鍗曟嵁鏁伴噺
int documentCount = receivableFeeList.size();
SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
@@ -263,6 +283,7 @@
result.setTotalAmountRmb(totalReceivableAmount);
result.setTotalAmountHkd(totalAmountHkd);
result.setDetailList(detailList);
+ result.setIds(ids);
return result;
}
@@ -300,36 +321,26 @@
}
// 4. 淇濆瓨涓昏处鍗曡褰�
- receivableBillManagementService.insertReceivableBillManagement(billManagement);
- Integer billId = billManagement.getId();
+ int i = receivableBillManagementService.insertReceivableBillManagement(billManagement);
- // 5. 鍒涘缓搴旀敹璐﹀崟缁撶畻鏄庣粏
- List<ReceivableBillSettlementDetail> detailList = new java.util.ArrayList<>();
- for (ReceivableFeeDetail feeDetail : statisticsVo.getDetailList()) {
- ReceivableBillSettlementDetail settlementDetail = new ReceivableBillSettlementDetail();
- settlementDetail.setBillId(billId);
+ // 5. 鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
+ if (statisticsVo.getIds() != null && statisticsVo.getIds().length > 0) {
+ // 鑾峰彇鐢熸垚鐨勮处鍗曠郴缁熺紪鍙�
+ String billSystemNo = billManagement.getSystemNo();
- // 鏍规嵁璐﹀崟绫诲瀷璁剧疆鏄庣粏閲戦
- if (billType == 0) {
- // 浜烘皯甯佽处鍗曚娇鐢ㄥ師閲戦
- settlementDetail.setReceiptAmount(feeDetail.getBillingAmount());
- } else {
- // 娓竵璐﹀崟杞崲閲戦
- settlementDetail.setReceiptAmount(feeDetail.getBillingAmount().divide(statisticsVo.getRate(), 2, RoundingMode.HALF_UP));
+ // 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
+ List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
+ for (Integer feeId : statisticsVo.getIds()) {
+ ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
+ feeManagement.setId(feeId);
+ feeManagement.setRelatedBillNo(billSystemNo);
+ feeManagements.add(feeManagement);
}
- // 璁剧疆鍏朵粬鏄庣粏淇℃伅
- settlementDetail.setSettlementMethod("0"); // 榛樿涓虹┖锛屽悗缁彲浠ユ洿鏂�
- settlementDetail.setCreateTime(DateUtils.getNowDate());
-
- detailList.add(settlementDetail);
+ // 璋冪敤鎵归噺鏇存柊鏂规硶
+ updateReceivableFeeManagementBatch(feeManagements);
}
- // 6. 鎵归噺淇濆瓨鏄庣粏璁板綍
- if (!detailList.isEmpty()) {
- receivableBillSettlementDetailService.insertReceivableBillSettlementDetailBatch(detailList);
- }
-
- return billId;
+ return i;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0