From 02737773121c421314d8c97daf9a320713afb7dd Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 11:41:07 +0800
Subject: [PATCH] 应付接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 198 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 183 insertions(+), 15 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 5484a48..030053d 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;
@@ -148,6 +146,12 @@
String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YS);
receivableFeeManagement.setSystemNo(noByKey);
+ // 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ String receivableAmountStr = calculateReceivableAmountStr(receivableFeeManagement.getReceivableFeeDetailList());
+ receivableFeeManagement.setReceivableAmountStr(receivableAmountStr);
+ }
+ receivableFeeManagement.setCreateBy(SecurityUtils.getUsername());
// 淇濆瓨涓昏〃淇℃伅
int result = receivableFeeManagementMapper.insertReceivableFeeManagement(receivableFeeManagement);
@@ -191,6 +195,12 @@
{
receivableFeeManagement.setUpdateTime(DateUtils.getNowDate());
+ // 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ String receivableAmountStr = calculateReceivableAmountStr(receivableFeeManagement.getReceivableFeeDetailList());
+ receivableFeeManagement.setReceivableAmountStr(receivableAmountStr);
+ }
+
// 1. 鏇存柊涓昏〃淇℃伅
int result = receivableFeeManagementMapper.updateReceivableFeeManagement(receivableFeeManagement);
@@ -205,7 +215,7 @@
// 璁剧疆姣忎釜鏄庣粏鐨勫簲鏀惰垂鐢ㄧ鐞咺D
receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
detail.setReceivableFeeId(receivableFeeId);
- detail.setUpdateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+ detail.setCreateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
});
// 璋冪敤鎵归噺鎻掑叆鏂规硶
@@ -358,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;
@@ -412,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) {
// 娓竵璐﹀崟
@@ -426,6 +466,7 @@
} else {
throw new IllegalArgumentException("鏃犳晥鐨勮处鍗曠被鍨嬶細" + billType);
}
+ billManagement.setPendingAmount(billManagement.getTotalAmount());
String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
billManagement.setSystemNo(noByKey);
// 4. 淇濆瓨涓昏处鍗曡褰�
@@ -461,7 +502,7 @@
return i;
}
-}
+
/**
* 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴旀敹璐圭敤绠＄悊璁板綍
@@ -474,4 +515,131 @@
public int updateReceivableFeeManagementByRelatedBillNo(String relatedBillNo) {
return receivableFeeManagementMapper.updateReceivableFeeManagementByRelatedBillNo(relatedBillNo);
}
+
+ /**
+ * 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ * 鏍规嵁鏄庣粏鍒楄〃鎸夊竵绉嶆眹鎬婚噾棰濓紝鏍煎紡濡傦細"200娓竵100浜烘皯甯�"
+ *
+ * @param detailList 搴旀敹璐圭敤鏄庣粏鍒楄〃
+ * @return 搴旀敹閲戦瀛楃涓叉弿杩�
+ */
+ private String calculateReceivableAmountStr(List<ReceivableFeeDetail> detailList) {
+ if (detailList == null || detailList.isEmpty()) {
+ return "";
+ }
+
+ // 鎸夊竵绉嶆眹鎬婚噾棰�
+ Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
+ for (ReceivableFeeDetail 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();
+ }
+
+ /**
+ * 瀵煎叆搴旀敹璐圭敤绠＄悊鏁版嵁
+ *
+ * @param receivableFeeList 搴旀敹璐圭敤绠＄悊鏁版嵁鍒楄〃
+ * @param updateSupport 鏄惁鏇存柊鏀寔锛屽鏋滃凡瀛樺湪锛屽垯杩涜鏇存柊鏁版嵁
+ * @param operName 鎿嶄綔鐢ㄦ埛
+ * @return 缁撴灉
+ */
+ @Override
+ public String importReceivableFee(List<ReceivableFeeManagement> receivableFeeList, Boolean updateSupport, 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 {
+ // 楠岃瘉绯荤粺缂栧彿鏄惁鍞竴
+ ReceivableFeeManagement checkFee = new ReceivableFeeManagement();
+ checkFee.setSystemNo(receivableFee.getSystemNo());
+ List<ReceivableFeeManagement> existingFees = selectReceivableFeeManagementList(checkFee);
+
+ if (!existingFees.isEmpty()) {
+ // 瀛樺湪閲嶅璁板綍
+ if (updateSupport) {
+ // 鏇存柊鏀寔锛岃繘琛屾洿鏂版搷浣�
+ ReceivableFeeManagement existingFee = existingFees.get(0);
+ receivableFee.setId(existingFee.getId());
+ receivableFee.setUpdateTime(DateUtils.getNowDate());
+ receivableFee.setUpdateBy(operName);
+ updateReceivableFeeManagement(receivableFee);
+ successNum++;
+ successMsg.append("<br/>" + successNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 鏇存柊鎴愬姛");
+ } else {
+ failureNum++;
+ failureMsg.append("<br/>" + failureNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 宸插瓨鍦�");
+ }
+ } else {
+ // 鏂板璁板綍
+ receivableFee.setCreateTime(DateUtils.getNowDate());
+ receivableFee.setCreateBy(operName);
+ insertReceivableFeeManagement(receivableFee);
+ successNum++;
+ successMsg.append("<br/>" + successNum + ". 绯荤粺缂栧彿 " + receivableFee.getSystemNo() + " 瀵煎叆鎴愬姛");
+ }
+ } catch (Exception e) {
+ failureNum++;
+ String msg = "<br/>" + failureNum + ". 绯荤粺缂栧彿 " + 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