From 279366f14d6e1361b6caf7c05b74f0cea4227a36 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 27 三月 2026 10:53:28 +0800
Subject: [PATCH] 新增推送
---
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java | 80 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 6 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 5b3f474..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
@@ -6,6 +6,7 @@
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;
@@ -17,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;
@@ -58,7 +60,8 @@
private IPayableBillManagementService payableBillManagementService;
@Resource
private SysConfigMapper sysConfigMapper;
-
+ @Autowired
+ ISystemDataNoService systemDataNoService;
/**
* 鏌ヨ搴斾粯璐圭敤绠＄悊
*
@@ -141,7 +144,9 @@
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();
@@ -154,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;
}
@@ -188,7 +203,39 @@
payableFeeManagement.setPayableAmountStr(payableAmountStr);
}
- return payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
+ // 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;
}
/**
@@ -342,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());
@@ -358,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);
@@ -382,7 +434,22 @@
return result;
}
+ /**
+ * 鏍规嵁鍏宠仈璐﹀崟缂栧彿鎵归噺鏇存柊搴斾粯璐圭敤绠＄悊璁板綍
+ * 娓呴櫎鍏宠仈璐﹀崟缂栧彿骞跺皢鐘舵�佹敼涓�0锛堝緟鐢熸垚璐﹀崟锛�
+ * 浣跨敤鍦烘櫙锛氬綋搴斾粯璐﹀崟琚垹闄ゆ垨浣滃簾鏃讹紝闇�瑕佸皢鍏宠仈鐨勫簲浠樿垂鐢ㄨ褰曟仮澶嶄负寰呯敓鎴愯处鍗曠姸鎬�
+ *
+ * @param relatedBillNo 鍏宠仈璐﹀崟缂栧彿
+ * @return 褰卞搷鐨勮鏁�
+ */
+ @Override
+ public int updatePayableFeeManagementByRelatedBillNo(String relatedBillNo)
+ {
+ // 璋冪敤Mapper灞傛柟娉曟墽琛屾壒閲忔洿鏂�
+ int result = payableFeeManagementMapper.updatePayableFeeManagementByRelatedBillNo(relatedBillNo);
+ return result;
+ }
/**
* 浣滃簾搴斾粯璐圭敤绠＄悊璁板綍
*
@@ -440,7 +507,7 @@
Map<String, BigDecimal> currencyAmountMap = new HashMap<>();
for (PayableFeeDetail detail : detailList) {
String currency = detail.getCurrency();
- BigDecimal billingAmount = detail.getBillingAmount();
+ BigDecimal billingAmount = detail.getActualAmount();
if (currency != null && billingAmount != null) {
currencyAmountMap.merge(currency, billingAmount, BigDecimal::add);
@@ -457,7 +524,7 @@
// 鏍规嵁甯佺鏄剧ず瀵瑰簲鐨勮揣甯佸悕绉�
String currency = entry.getKey();
- if ("CNY".equals(currency)) {
+ if ("RMB".equals(currency)) {
sb.append("浜烘皯甯�");
} else if ("HKD".equals(currency)) {
sb.append("娓竵");
@@ -473,3 +540,4 @@
}
+
--
Gitblit v1.8.0