From aa3757e8e1d986a65436c2dccec82f486ee690b5 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 09:51:31 +0800
Subject: [PATCH] 应付接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 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 159f8b2..9c532c6 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,9 +2,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.exception.ServiceException;
@@ -370,23 +368,52 @@
SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
setConfigKey("sys.hk.rmb.rate");
}});
- // 璁＄畻鎬诲簲鏀堕噾棰�
- BigDecimal totalReceivableAmount = receivableFeeList.stream()
- .map(ReceivableFeeManagement::getReceivableAmount)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 璁＄畻鎬诲簲鏀堕噾棰濓紙鎸夊竵绉嶅垎鍒绠楋級
+ BigDecimal totalAmountRmb = BigDecimal.ZERO;
+ BigDecimal totalAmountHkd = BigDecimal.ZERO;
-
+ // 鑾峰彇鎵�鏈夊簲鏀惰垂鐢ㄦ槑缁嗭紝鎸夊竵绉嶆眹鎬�
+ if (!receivableFeeList.isEmpty()) {
+ // 鑾峰彇鎵�鏈夊簲鏀惰垂鐢↖D
+ Integer[] feeIds = receivableFeeList.stream()
+ .map(ReceivableFeeManagement::getId)
+ .toArray(Integer[]::new);
+
+ // 鏌ヨ鎵�鏈夋槑缁嗚褰�
+ List<ReceivableFeeDetail> allDetails = receivableFeeDetailService.selectReceivableFeeDetailByReceivableFeeIds(feeIds);
+
+ // 鎸夊竵绉嶆眹鎬婚噾棰�
+ for (ReceivableFeeDetail detail : allDetails) {
+ if (detail.getBillingAmount() != null && detail.getCurrency() != null) {
+ if ("RMB".equals(detail.getCurrency())) {
+ totalAmountRmb = totalAmountRmb.add(detail.getBillingAmount());
+ } else if ("HKD".equals(detail.getCurrency())) {
+ totalAmountHkd = totalAmountHkd.add(detail.getBillingAmount());
+ }
+ }
+ }
+ }
+
BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
- BigDecimal totalAmountHkd = totalReceivableAmount.divide(exchangeRate, 2, RoundingMode.HALF_UP);
+
+ // 璁＄畻浜烘皯甯佹�婚噾棰濓紙浜烘皯甯侀噾棰� + 娓竵鎹㈢畻鎴愪汉姘戝竵锛�
+ BigDecimal totalAmountRmbWithConversion = totalAmountRmb.add(
+ totalAmountHkd.multiply(exchangeRate).setScale(2, RoundingMode.HALF_UP)
+ );
+
+ // 璁＄畻娓竵鎬婚噾棰濓紙娓竵閲戦 + 浜烘皯甯佹崲绠楁垚娓竵锛�
+ BigDecimal totalAmountHkdWithConversion = totalAmountHkd.add(
+ totalAmountRmb.divide(exchangeRate, 2, RoundingMode.HALF_UP)
+ );
// 缁勮杩斿洖缁撴灉
ReceivableFeeStatisticsVo result = new ReceivableFeeStatisticsVo();
result.setDocumentCount(documentCount);
result.setRate(exchangeRate);
- result.setTotalReceivableAmount(totalReceivableAmount);
- result.setTotalAmountRmb(totalReceivableAmount);
- result.setTotalAmountHkd(totalAmountHkd);
+ result.setTotalReceivableAmount(totalAmountRmbWithConversion); // 榛樿浣跨敤浜烘皯甯佹�婚噾棰�
+ result.setTotalAmountRmb(totalAmountRmbWithConversion);
+ result.setTotalAmountHkd(totalAmountHkdWithConversion);
result.setIds(ids);
return result;
@@ -424,12 +451,13 @@
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. 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
if (billType == 0) {
// 浜烘皯甯佽处鍗�
- billManagement.setCurrency("CNY");
+ billManagement.setCurrency("RMB");
billManagement.setTotalAmount(statisticsVo.getTotalAmountRmb());
} else if (billType == 1) {
// 娓竵璐﹀崟
@@ -438,6 +466,7 @@
} else {
throw new IllegalArgumentException("鏃犳晥鐨勮处鍗曠被鍨嬶細" + billType);
}
+ billManagement.setPendingAmount(billManagement.getTotalAmount());
String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
billManagement.setSystemNo(noByKey);
// 4. 淇濆瓨涓昏处鍗曡褰�
@@ -520,7 +549,7 @@
// 鏍规嵁甯佺鏄剧ず瀵瑰簲鐨勮揣甯佸悕绉�
String currency = entry.getKey();
- if ("CNY".equals(currency)) {
+ if ("RMB".equals(currency)) {
sb.append("浜烘皯甯�");
} else if ("HKD".equals(currency)) {
sb.append("娓竵");
--
Gitblit v1.8.0