From d537057a0bac012bb6909b89586089a01b8d8a9e Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 13:48:03 +0800
Subject: [PATCH] 新增供应商银行
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 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 65693d6..311e4e0 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
@@ -151,7 +151,7 @@
String receivableAmountStr = calculateReceivableAmountStr(receivableFeeManagement.getReceivableFeeDetailList());
receivableFeeManagement.setReceivableAmountStr(receivableAmountStr);
}
-
+ receivableFeeManagement.setCreateBy(SecurityUtils.getUsername());
// 淇濆瓨涓昏〃淇℃伅
int result = receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
@@ -215,7 +215,7 @@
// 璁剧疆姣忎釜鏄庣粏鐨勫簲鏀惰垂鐢ㄧ鐞咺D
receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
detail.setReceivableFeeId(receivableFeeId);
- detail.setUpdateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+ detail.setCreateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
});
// 璋冪敤鎵归噺鎻掑叆鏂规硶
@@ -451,6 +451,7 @@
billManagement.setCreateTime(DateUtils.getNowDate());
billManagement.setBillName(billCreateVo.getBillName());
billManagement.setCustomerName(billCreateVo.getCustomerName());
+ billManagement.setCreateBy(SecurityUtils.getUsername());
billManagement.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
billManagement.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
// 3. 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
@@ -465,6 +466,7 @@
} else {
throw new IllegalArgumentException("鏃犳晥鐨勮处鍗曠被鍨嬶細" + billType);
}
+ billManagement.setPendingAmount(billManagement.getTotalAmount());
String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
billManagement.setSystemNo(noByKey);
// 4. 淇濆瓨涓昏处鍗曡褰�
@@ -530,7 +532,7 @@
Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
for (ReceivableFeeDetail detail : detailList) {
String currency = detail.getCurrency();
- BigDecimal billingAmount = detail.getBillingAmount();
+ BigDecimal billingAmount = detail.getActualAmount();
if (currency != null && billingAmount != null) {
currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
@@ -560,4 +562,79 @@
return sb.toString();
}
+
+ /**
+ * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁锛堝寘鍚槑缁嗘暟鎹級
+ *
+ * @param receivableFeeList 搴旀敹璐圭敤绠＄悊鏁版嵁鍒楄〃锛堝寘鍚槑缁嗘暟鎹級
+ * @param operName 鎿嶄綔鐢ㄦ埛
+ * @return 缁撴灉
+ */
+ @Override
+ public String importReceivableFee(List<ReceivableFeeManagement> receivableFeeList, String operName) {
+ if (receivableFeeList == null || receivableFeeList.isEmpty()) {
+ return "瀵煎叆鏁版嵁涓嶈兘涓虹┖锛�";
+ }
+ int successNum = 0;
+ int failureNum = 0;
+ StringBuilder successMsg = new StringBuilder();
+ StringBuilder failureMsg = new StringBuilder();
+
+ for (ReceivableFeeManagement receivableFee : receivableFeeList) {
+ try {
+ // 鑷姩鐢熸垚绯荤粺缂栧彿锛堝拰鏂板鍔熻兘涓�鏍凤級
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YS);
+ receivableFee.setSystemNo(noByKey);
+
+ // 璁剧疆鍒涘缓鏃堕棿鍜屽垱寤轰汉
+ receivableFee.setCreateTime(DateUtils.getNowDate());
+ receivableFee.setCreateBy(operName);
+
+ // 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ if (receivableFee.getReceivableFeeDetailList() != null && !receivableFee.getReceivableFeeDetailList().isEmpty()) {
+ String receivableAmountStr = calculateReceivableAmountStr(receivableFee.getReceivableFeeDetailList());
+ receivableFee.setReceivableAmountStr(receivableAmountStr);
+ }
+
+ // 鏂板璁板綍锛堜笉鍋氬瓨鍦ㄦ�у垽鏂級
+ int result = insertReceivableFeeManagement(receivableFee);
+
+ if (result > 0) {
+ successNum++;
+ successMsg.append("<br/>" + successNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆鎴愬姛");
+ } else {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆澶辫触");
+ }
+ } catch (Exception e) {
+ failureNum++;
+ String msg = "<br/>" + failureNum + ". 绯荤粺缂栧彿 " + (receivableFee.getSystemNo() != null ? receivableFee.getSystemNo() : "鏈煡") + " 瀵煎叆澶辫触锛�";
+ failureMsg.append(msg + e.getMessage());
+ logger.error(msg, e);
+ }
+ }
+
+ if (failureNum > 0) {
+ failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
+ throw new ServiceException(failureMsg.toString());
+ } else {
+ successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + successNum + " 鏉★紝鏁版嵁濡備笅锛�");
+ }
+ return successMsg.toString();
+ }
+
+ /**
+ * 涓嬭浇瀵煎叆妯℃澘
+ *
+ * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
+ */
+ @DataSource(DataSourceType.SLAVE)
+ @Async
+ @Override
+ public void importTemplate(String exportKey) {
+ super.export(ReceivableFeeManagement.class, exportKey, "receivableFeeManagementTemplate", (pageNum) -> {
+ // 杩斿洖绌哄垪琛紝鍙鍑烘ā鏉跨粨鏋�
+ return new ArrayList<ReceivableFeeManagement>();
+ });
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0