From 298a6477b6220f651062080264750dcb04573eca Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 23 十二月 2025 16:47:23 +0800
Subject: [PATCH] 应付接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 23 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..5b3f474 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,6 +2,8 @@
import java.math.RoundingMode;
import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
import java.math.BigDecimal;
import com.ruoyi.common.utils.DateUtils;
@@ -134,6 +136,12 @@
{
payableFeeManagement.setCreateTime(DateUtils.getNowDate());
+ // 璁＄畻搴斾粯閲戦瀛楃涓叉弿杩�
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ String payableAmountStr = calculatePayableAmountStr(payableFeeManagement.getPayableFeeDetailList());
+ payableFeeManagement.setPayableAmountStr(payableAmountStr);
+ }
+
// 淇濆瓨涓诲疄浣�
int result = payableFeeManagementMapper.insertPayableFeeManagement(payableFeeManagement);
Integer payableFeeId = payableFeeManagement.getId();
@@ -173,6 +181,13 @@
public int updatePayableFeeManagement(PayableFeeManagement payableFeeManagement)
{
payableFeeManagement.setUpdateTime(DateUtils.getNowDate());
+
+ // 璁＄畻搴斾粯閲戦瀛楃涓叉弿杩�
+ if (payableFeeManagement.getPayableFeeDetailList() != null && !payableFeeManagement.getPayableFeeDetailList().isEmpty()) {
+ String payableAmountStr = calculatePayableAmountStr(payableFeeManagement.getPayableFeeDetailList());
+ payableFeeManagement.setPayableAmountStr(payableAmountStr);
+ }
+
return payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
}
@@ -249,34 +264,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;
}
@@ -323,7 +349,7 @@
// 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
if (billCreateVo.getBillType() == 0) {
// 浜烘皯甯佽处鍗�
- bill.setCurrency("CNY");
+ bill.setCurrency("RMB");
bill.setTotalAmount(statisticsVo.getTotalAmountRmb());
bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
} else {
@@ -397,6 +423,53 @@
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.getBillingAmount();
+
+ 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 ("CNY".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