From 849648e82e5dec96f9f30fcc9c9bd799268b1f4c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:44 +0800
Subject: [PATCH] 新增资金流水导入
---
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java | 193 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 167 insertions(+), 26 deletions(-)
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 2e88cab..526229b 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
@@ -2,8 +2,11 @@
import java.math.RoundingMode;
import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
import java.math.BigDecimal;
+import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import javax.annotation.Resource;
@@ -15,6 +18,7 @@
import com.ruoyi.cwgl.domain.vo.PayableBillCreateVo;
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;
@@ -56,7 +60,8 @@
private IPayableBillManagementService payableBillManagementService;
@Resource
private SysConfigMapper sysConfigMapper;
-
+ @Autowired
+ ISystemDataNoService systemDataNoService;
/**
* 鏌ヨ搴斾粯璐圭敤绠＄悊
*
@@ -134,6 +139,14 @@
{
payableFeeManagement.setCreateTime(DateUtils.getNowDate());
+ // 璁＄畻搴斾粯閲戦瀛楃涓叉弿杩�
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ String payableAmountStr = calculatePayableAmountStr(payableFeeManagement.getPayableFeeDetailList());
+ payableFeeManagement.setPayableAmountStr(payableAmountStr);
+ }
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YF);
+ payableFeeManagement.setSystemNo(noByKey);
+ payableFeeManagement.setCreateBy(SecurityUtils.getUsername());
// 淇濆瓨涓诲疄浣�
int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
Integer payableFeeId = payableFeeManagement.getId();
@@ -146,7 +159,17 @@
});
payableFeeDetailService.insertPayableFeeDetailBatch(payableFeeManagement.getPayableFeeDetailList());
}
-
+
+ if (result > 0) {
+ PayableFeeManagementLog log = new PayableFeeManagementLog();
+ log.setPayableFeeId(payableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鏂板搴斾粯璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + payableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertPayableFeeManagementLog(log);
+ }
+
return result;
}
@@ -173,7 +196,46 @@
public int updatePayableFeeManagement(PayableFeeManagement payableFeeManagement)
{
payableFeeManagement.setUpdateTime(DateUtils.getNowDate());
- return payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
+
+ // 璁＄畻搴斾粯閲戦瀛楃涓叉弿杩�
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ String payableAmountStr = calculatePayableAmountStr(payableFeeManagement.getPayableFeeDetailList());
+ payableFeeManagement.setPayableAmountStr(payableAmountStr);
+ }
+
+ // 1. 鏇存柊涓昏〃淇℃伅
+ int result = payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
+
+ // 2. 鑾峰彇涓昏〃ID
+ Integer payableFeeId = payableFeeManagement.getId();
+
+ // 3. 鍒犻櫎璇ュ簲浠樿垂鐢ㄤ笅鐨勬墍鏈夌幇鏈夋槑缁�
+ payableFeeDetailService.deletePayableFeeDetailByPayableFeeId(payableFeeId);
+
+ // 4. 鎵归噺淇濆瓨鏂扮殑鏄庣粏鍒楄〃
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ // 璁剧疆姣忎釜鏄庣粏鐨勫簲浠樿垂鐢ㄧ鐞咺D
+ payableFeeManagement.getPayableFeeDetailList().forEach(detail -> {
+ detail.setPayableFeeId(payableFeeId);
+ detail.setCreateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+ });
+
+ // 璋冪敤鎵归噺鎻掑叆鏂规硶
+ payableFeeDetailService.insertPayableFeeDetailBatch(payableFeeManagement.getPayableFeeDetailList());
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ PayableFeeManagementLog log = new PayableFeeManagementLog();
+ log.setPayableFeeId(payableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("淇敼搴斾粯璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + payableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertPayableFeeManagementLog(log);
+ }
+
+ return result;
}
/**
@@ -249,34 +311,45 @@
throw new RuntimeException("鎵�閫夎褰曠殑渚涘簲鍟嗗悕绉颁笉涓�鑷达紝鏃犳硶杩涜缁熻");
}
}
- // 璁＄畻鍗曟嵁鏁伴噺
- int documentCount = feeList.size();
+
+ // 鑾峰彇姹囩巼閰嶇疆
SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
setConfigKey("sys.hk.rmb.rate");
}});
+ BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
+ statisticsVo.setRate(exchangeRate);
+
// 璁剧疆鍗曟嵁鏁伴噺
statisticsVo.setDocumentCount(feeList.size());
-
- // 璁剧疆姹囩巼锛堥粯璁ゆ眹鐜囷級
- statisticsVo.setRate(new BigDecimal("0.90"));
-
-
-
-
- // 璁＄畻鎬诲簲鏀堕噾棰�
- BigDecimal totalPayableAmount = feeList.stream()
- .map(PayableFeeManagement::getPayableAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-
- BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
- BigDecimal totalAmountHkd = totalPayableAmount.divide(exchangeRate, 2, RoundingMode.HALF_UP);
-
- statisticsVo.setDocumentCount(documentCount);
- statisticsVo.setTotalPayableAmount(totalPayableAmount);
- statisticsVo.setTotalAmountRmb(totalPayableAmount);
- statisticsVo.setTotalAmountHkd(totalAmountHkd);
statisticsVo.setIds(ids);
+
+ // 鑾峰彇鎵�鏈夊簲浠樿垂鐢ㄦ槑缁嗭紝鎸夊竵绉嶅垎鍒绠楅噾棰�
+ List<PayableFeeDetail> detailList = payableFeeDetailService.selectPayableFeeDetailByPayableFeeIds(ids);
+
+ // 鎸夊竵绉嶆眹鎬婚噾棰�
+ BigDecimal totalAmountRmb = BigDecimal.ZERO;
+ BigDecimal totalAmountHkd = BigDecimal.ZERO;
+
+ for (PayableFeeDetail detail : detailList) {
+ if ("CNY".equals(detail.getCurrency())) {
+ totalAmountRmb = totalAmountRmb.add(detail.getBillingAmount());
+ } else if ("HKD".equals(detail.getCurrency())) {
+ totalAmountHkd = totalAmountHkd.add(detail.getBillingAmount());
+ }
+ }
+
+ // 璁＄畻杞崲鍚庣殑鎬婚噾棰�
+ BigDecimal totalAmountRmbWithConversion = totalAmountRmb.add(
+ totalAmountHkd.multiply(exchangeRate).setScale(2, RoundingMode.HALF_UP)
+ );
+ BigDecimal totalAmountHkdWithConversion = totalAmountHkd.add(
+ totalAmountRmb.divide(exchangeRate, 2, RoundingMode.HALF_UP)
+ );
+
+ // 璁剧疆缁熻缁撴灉
+ statisticsVo.setTotalPayableAmount(totalAmountRmbWithConversion);
+ statisticsVo.setTotalAmountRmb(totalAmountRmbWithConversion);
+ statisticsVo.setTotalAmountHkd(totalAmountHkdWithConversion);
return statisticsVo;
}
@@ -316,6 +389,8 @@
bill.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
bill.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
bill.setDocumentCount(statisticsVo.getDocumentCount());
+ bill.setCreateBy(SecurityUtils.getUsername());
+
bill.setExchangeRate(statisticsVo.getRate());
bill.setStatus("0"); // 鑽夌鐘舵��
bill.setCreateTime(DateUtils.getNowDate());
@@ -323,7 +398,7 @@
// 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
if (billCreateVo.getBillType() == 0) {
// 浜烘皯甯佽处鍗�
- bill.setCurrency("CNY");
+ bill.setCurrency("RMB");
bill.setTotalAmount(statisticsVo.getTotalAmountRmb());
bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
} else {
@@ -332,6 +407,9 @@
bill.setTotalAmount(statisticsVo.getTotalAmountHkd());
bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
}
+ bill.setPendingAmount(bill.getTotalAmount());
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YFZD);
+ bill.setSystemNo(noByKey);
// 淇濆瓨搴斾粯璐﹀崟璁板綍
int result = payableBillManagementService.insertPayableBillManagement(bill);
@@ -356,7 +434,22 @@
return result;
}
+ /**
+ * 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴斾粯璐圭敤绠＄悊璁板綍
+ * 娓呴櫎鍏宠仈璐﹀崟缂栧彿骞跺皢鐘舵�佹敼涓�0锛堝緟鐢熸垚璐﹀崟锛�
+ * 浣跨敤鍦烘櫙锛氬綋搴斾粯璐﹀崟琚垹闄ゆ垨浣滃簾鏃讹紝闇�瑕佸皢鍏宠仈鐨勫簲浠樿垂鐢ㄨ褰曟仮澶嶄负寰呯敓鎴愯处鍗曠姸鎬�
+ *
+ * @param relatedBillNo 鍏宠仈璐﹀崟缂栧彿
+ * @return 褰卞搷鐨勮鏁�
+ */
+ @Override
+ public int updatePayableFeeManagementByRelatedBillNo(String relatedBillNo)
+ {
+ // 璋冪敤Mapper灞傛柟娉曟墽琛屾壒閲忔洿鏂�
+ int result = payableFeeManagementMapper.updatePayableFeeManagementByRelatedBillNo(relatedBillNo);
+ return result;
+ }
/**
* 浣滃簾搴斾粯璐圭敤绠＄悊璁板綍
*
@@ -397,6 +490,54 @@
return result;
}
+
+ /**
+ * 璁＄畻搴斾粯閲戦瀛楃涓叉弿杩�
+ * 鏍规嵁鏄庣粏鍒楄〃鎸夊竵绉嶆眹鎬婚噾棰濓紝鏍煎紡濡傦細"200娓竵100浜烘皯甯�"
+ *
+ * @param detailList 搴斾粯璐圭敤鏄庣粏鍒楄〃
+ * @return 搴斾粯閲戦瀛楃涓叉弿杩�
+ */
+ private String calculatePayableAmountStr(List<PayableFeeDetail> detailList) {
+ if (detailList == null || detailList.isEmpty()) {
+ return "";
+ }
+
+ // 鎸夊竵绉嶆眹鎬婚噾棰�
+ Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
+ for (PayableFeeDetail detail : detailList) {
+ String currency = detail.getCurrency();
+ BigDecimal billingAmount = detail.getActualAmount();
+
+ if (currency != null && billingAmount != null) {
+ currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
+ }
+ }
+
+ // 鏋勫缓瀛楃涓叉弿杩�
+ StringBuilder sb = new StringBuilder();
+ for (Map.Entry<String, BigDecimal> entry : currencyAmountMap.entrySet()) {
+ if (sb.length() > 0) {
+ sb.append(" ");
+ }
+ sb.append(entry.getValue().stripTrailingZeros().toPlainString());
+
+ // 鏍规嵁甯佺鏄剧ず瀵瑰簲鐨勮揣甯佸悕绉�
+ String currency = entry.getKey();
+ if ("RMB".equals(currency)) {
+ sb.append("浜烘皯甯�");
+ } else if ("HKD".equals(currency)) {
+ sb.append("娓竵");
+ } else if ("USD".equals(currency)) {
+ sb.append("缇庡厓");
+ } else {
+ sb.append(currency);
+ }
+ }
+
+ return sb.toString();
+ }
}
+
--
Gitblit v1.8.0