From 2aaa32f860d4f3fbda01eded1b20a7cab9d3a393 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期三, 24 十二月 2025 10:58:20 +0800
Subject: [PATCH] 应付接口
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 332 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 285 insertions(+), 47 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 a2622ca..4c26ef3 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,16 +2,19 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import com.ruoyi.common.enums.SystemDataNoEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.cwgl.domain.ReceivableFeeDetail;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
import com.ruoyi.cwgl.domain.vo.ReceivableFeeStatisticsVo;
+import com.ruoyi.cwgl.service.*;
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;
@@ -28,12 +31,10 @@
import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
import com.ruoyi.cwgl.domain.ReceivableBillManagement;
import com.ruoyi.cwgl.domain.ReceivableBillSettlementDetail;
-import com.ruoyi.cwgl.service.IReceivableFeeDetailService;
-import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
-import com.ruoyi.cwgl.service.IReceivableBillManagementService;
-import com.ruoyi.cwgl.service.IReceivableBillSettlementDetailService;
import com.ruoyi.cwgl.domain.vo.ReceivableBillCreateVo;
import com.ruoyi.common.core.text.Convert;
+
+import javax.annotation.Resource;
/**
* 搴旀敹璐圭敤绠＄悊Service涓氬姟灞傚鐞�
@@ -58,9 +59,13 @@
@Autowired
private IReceivableBillManagementService receivableBillManagementService;
- @Autowired
- private IReceivableBillSettlementDetailService receivableBillSettlementDetailService;
+
+ @Autowired
+ ISystemDataNoService systemDataNoService;
+
+ @Autowired
+ private IReceivableFeeManagementLogService logService;
/**
* 鏌ヨ搴旀敹璐圭敤绠＄悊
@@ -72,7 +77,15 @@
@Override
public ReceivableFeeManagement selectReceivableFeeManagementById(Integer id)
{
- return receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ ReceivableFeeManagement receivableFeeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ if (receivableFeeManagement != null) {
+ // 鏌ヨ瀵瑰簲鐨勮垂鐢ㄦ槑缁�
+ ReceivableFeeDetail detail = new ReceivableFeeDetail();
+ detail.setReceivableFeeId(id);
+ List<ReceivableFeeDetail> detailList = receivableFeeDetailService.selectReceivableFeeDetailList(detail);
+ receivableFeeManagement.setReceivableFeeDetailList(detailList);
+ }
+ return receivableFeeManagement;
}
/**
@@ -130,7 +143,15 @@
public int insertReceivableFeeManagement(ReceivableFeeManagement receivableFeeManagement)
{
receivableFeeManagement.setCreateTime(DateUtils.getNowDate());
-
+ 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);
@@ -149,20 +170,18 @@
receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
}
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(receivableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鏂板搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + receivableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
return result;
- }
-
- /**
- * 鏂板搴旀敹璐圭敤绠＄悊[鎵归噺]
- *
- * @param receivableFeeManagements 搴旀敹璐圭敤绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertReceivableFeeManagementBatch(List<ReceivableFeeManagement> receivableFeeManagements)
- {
- int rows = receivableFeeManagementMapper.insertReceivableFeeManagementBatch(receivableFeeManagements);
- return rows;
}
/**
@@ -175,7 +194,101 @@
public int updateReceivableFeeManagement(ReceivableFeeManagement receivableFeeManagement)
{
receivableFeeManagement.setUpdateTime(DateUtils.getNowDate());
- return receivableFeeManagementMapper.updateReceivableFeeManagement(receivableFeeManagement);
+
+ // 璁＄畻搴旀敹閲戦瀛楃涓叉弿杩�
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ String receivableAmountStr = calculateReceivableAmountStr(receivableFeeManagement.getReceivableFeeDetailList());
+ receivableFeeManagement.setReceivableAmountStr(receivableAmountStr);
+ }
+
+ // 1. 鏇存柊涓昏〃淇℃伅
+ int result = receivableFeeManagementMapper.updateReceivableFeeManagement(receivableFeeManagement);
+
+ // 2. 鑾峰彇涓昏〃ID
+ Integer receivableFeeId = receivableFeeManagement.getId();
+
+ // 3. 鍒犻櫎璇ュ簲鏀惰垂鐢ㄤ笅鐨勬墍鏈夌幇鏈夋槑缁�
+ receivableFeeDetailService.deleteReceivableFeeDetailByReceivableFeeId(receivableFeeId);
+
+ // 4. 鎵归噺淇濆瓨鏂扮殑鏄庣粏鍒楄〃
+ if (receivableFeeManagement.getReceivableFeeDetailList() != null && !receivableFeeManagement.getReceivableFeeDetailList().isEmpty()) {
+ // 璁剧疆姣忎釜鏄庣粏鐨勫簲鏀惰垂鐢ㄧ鐞咺D
+ receivableFeeManagement.getReceivableFeeDetailList().forEach(detail -> {
+ detail.setReceivableFeeId(receivableFeeId);
+ detail.setUpdateTime(DateUtils.getNowDate()); // 璁剧疆鏇存柊鏃堕棿
+ });
+
+ // 璋冪敤鎵归噺鎻掑叆鏂规硶
+ receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
+ }
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(receivableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("淇敼搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + receivableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
+ return result;
+ }
+
+ /**
+ * 浣滃簾搴旀敹璐圭敤绠＄悊璁板綍
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int voidReceivableFeeManagement(Integer id) {
+ // 鏌ヨ璐圭敤绠＄悊璁板綍
+ ReceivableFeeManagement feeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ if (feeManagement == null) {
+ throw new ServiceException("璐圭敤绠＄悊璁板綍涓嶅瓨鍦�");
+ }
+
+ // 鍒ゆ柇鐘舵�佹槸鍚︿负0锛堝緟鐢熸垚璐﹀崟锛夛紝鍙湁鐘舵�佷负0鎵嶈兘浣滃簾
+ if (!"0".equals(feeManagement.getStatus())) {
+ throw new ServiceException("鍙湁鐘舵�佷负寰呯敓鎴愯处鍗曠殑璁板綍鎵嶈兘浣滃簾");
+ }
+
+ // 璁剧疆鐘舵�佷负浣滃簾锛堝亣璁剧敤"2"琛ㄧず浣滃簾鐘舵�侊級
+ feeManagement.setStatus("2");
+ feeManagement.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊璁板綍
+ int result = receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(id);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("浣滃簾搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + feeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊[鎵归噺]
+ *
+ * @param receivableFeeManagements 搴旀敹璐圭敤绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertReceivableFeeManagementBatch(List<ReceivableFeeManagement> receivableFeeManagements)
+ {
+ int rows = receivableFeeManagementMapper.insertReceivableFeeManagementBatch(receivableFeeManagements);
+ return rows;
}
/**
@@ -239,31 +352,68 @@
// 鏌ヨ搴旀敹璐圭敤涓昏〃璁板綍
List<ReceivableFeeManagement> receivableFeeList = receivableFeeManagementMapper.selectReceivableFeeManagementByIds(ids);
+ // 妫�鏌ユ墍鏈夎褰曟槸鍚﹀睘浜庡悓涓�涓鎴�
+ if (!receivableFeeList.isEmpty()) {
+ Integer firstCustomerId = receivableFeeList.get(0).getCustomerId();
+ boolean allSameCustomer = receivableFeeList.stream()
+ .allMatch(item -> Objects.equals(item.getCustomerId(), firstCustomerId));
+
+ if (!allSameCustomer) {
+ throw new ServiceException("鎵�閫夎褰曞寘鍚笉鍚屽鎴风殑鏁版嵁锛屾棤娉曡繘琛岀粺璁�");
+ }
+ }
+
// 璁＄畻鍗曟嵁鏁伴噺
int documentCount = receivableFeeList.size();
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 totalAmountRmbWithConversion = totalAmountRmb.add(
+ totalAmountHkd.multiply(exchangeRate).setScale(2, RoundingMode.HALF_UP)
+ );
+
+ // 璁＄畻娓竵鎬婚噾棰濓紙娓竵閲戦 + 浜烘皯甯佹崲绠楁垚娓竵锛�
+ BigDecimal totalAmountHkdWithConversion = totalAmountHkd.add(
+ totalAmountRmb.divide(exchangeRate, 2, RoundingMode.HALF_UP)
+ );
- BigDecimal exchangeRate = new BigDecimal(sysConfig.getConfigValue());
- BigDecimal totalAmountHkd = totalReceivableAmount.divide(exchangeRate, 2, RoundingMode.HALF_UP);
-
- // 鏌ヨ搴旀敹璐圭敤鏄庣粏
- List<ReceivableFeeDetail> detailList = receivableFeeDetailService.selectReceivableFeeDetailByReceivableFeeIds(ids);
-
// 缁勮杩斿洖缁撴灉
ReceivableFeeStatisticsVo result = new ReceivableFeeStatisticsVo();
result.setDocumentCount(documentCount);
result.setRate(exchangeRate);
- result.setTotalReceivableAmount(totalReceivableAmount);
- result.setTotalAmountRmb(totalReceivableAmount);
- result.setTotalAmountHkd(totalAmountHkd);
- result.setDetailList(detailList);
+ result.setTotalReceivableAmount(totalAmountRmbWithConversion); // 榛樿浣跨敤浜烘皯甯佹�婚噾棰�
+ result.setTotalAmountRmb(totalAmountRmbWithConversion);
+ result.setTotalAmountHkd(totalAmountHkdWithConversion);
result.setIds(ids);
return result;
@@ -279,19 +429,35 @@
public Integer createReceivableBill(ReceivableBillCreateVo billCreateVo) {
// 1. 鍑嗗鏁版嵁
ReceivableFeeStatisticsVo statisticsVo = billCreateVo.getStatisticsData();
+
+ // 妫�鏌ヨ垂鐢ㄧ鐞嗚〃鐨勭姸鎬侊紝鍙湁鐘舵�佷负0鎵嶈兘鍒涘缓璐﹀崟
+ Integer[] feeIds = statisticsVo.getIds();
+ if (feeIds != null && feeIds.length > 0) {
+ for (Integer feeId : feeIds) {
+ ReceivableFeeManagement feeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(feeId);
+ if (feeManagement != null && !"0".equals(feeManagement.getStatus())) {
+ throw new ServiceException("璐圭敤璁板綍ID涓�" + feeId + "鐨勭姸鎬佷笉鏄緟鐢熸垚璐﹀崟锛屾棤娉曞垱寤鸿处鍗�");
+ }
+ }
+ }
+
Integer billType = billCreateVo.getBillType();
// 2. 鍒涘缓搴旀敹璐﹀崟涓昏褰�
ReceivableBillManagement billManagement = new ReceivableBillManagement();
billManagement.setDocumentCount(statisticsVo.getDocumentCount());
billManagement.setExchangeRate(statisticsVo.getRate());
- billManagement.setStatus("DRAFT"); // 榛樿鑽夌鐘舵��
+ billManagement.setStatus("0"); // 榛樿鑽夌鐘舵��
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) {
// 娓竵璐﹀崟
@@ -300,7 +466,9 @@
} else {
throw new IllegalArgumentException("鏃犳晥鐨勮处鍗曠被鍨嬶細" + billType);
}
-
+ billManagement.setPendingAmount(billManagement.getTotalAmount());
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.YSZD);
+ billManagement.setSystemNo(noByKey);
// 4. 淇濆瓨涓昏处鍗曡褰�
int i = receivableBillManagementService.insertReceivableBillManagement(billManagement);
@@ -310,18 +478,88 @@
String billSystemNo = billManagement.getSystemNo();
// 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
- List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
for (Integer feeId : statisticsVo.getIds()) {
ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
feeManagement.setId(feeId);
feeManagement.setRelatedBillNo(billSystemNo);
- feeManagements.add(feeManagement);
+ feeManagement.setStatus("1");
+ receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(feeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鐢熸垚搴旀敹璐﹀崟锛岃处鍗曠紪鍙凤細" + billSystemNo);
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
}
// 璋冪敤鎵归噺鏇存柊鏂规硶
- updateReceivableFeeManagementBatch(feeManagements);
+
}
return i;
}
+
+
+
+ /**
+ * 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴旀敹璐圭敤绠＄悊璁板綍
+ * 娓呴櫎鍏宠仈璐﹀崟缂栧彿骞跺皢鐘舵�佹敼涓�0锛堝緟鐢熸垚璐﹀崟锛�
+ *
+ * @param relatedBillNo 鍏宠仈璐﹀崟缂栧彿
+ * @return 缁撴灉
+ */
+ @Override
+ 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();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0