From 9f41c41fc1c60e572c137cd93a6b45b0e05f34e2 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 23 十二月 2025 14:48:26 +0800
Subject: [PATCH] 新增日志
---
service/src/main/java/com/ruoyi/cwgl/service/impl/PayableFeeManagementServiceImpl.java | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 204 insertions(+), 2 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 b45b7d3..2e88cab 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
@@ -1,9 +1,21 @@
package com.ruoyi.cwgl.service.impl;
+import java.math.RoundingMode;
import java.util.List;
+import java.math.BigDecimal;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import javax.annotation.Resource;
+
+import com.ruoyi.cwgl.domain.*;
+import com.ruoyi.cwgl.service.IPayableFeeManagementLogService;
+import com.ruoyi.cwgl.service.IPayableBillManagementService;
+import com.ruoyi.cwgl.domain.vo.PayableFeeStatisticsVo;
+import com.ruoyi.cwgl.domain.vo.PayableBillCreateVo;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -16,7 +28,6 @@
import com.ruoyi.common.core.service.BaseService;
import com.ruoyi.cwgl.mapper.PayableFeeManagementMapper;
-import com.ruoyi.cwgl.domain.PayableFeeManagement;
import com.ruoyi.cwgl.service.IPayableFeeManagementService;
import com.ruoyi.cwgl.service.IPayableFeeDetailService;
import com.ruoyi.common.core.text.Convert;
@@ -38,6 +49,13 @@
@Resource
private IPayableFeeDetailService payableFeeDetailService;
+ @Autowired
+ private IPayableFeeManagementLogService logService;
+
+ @Autowired
+ private IPayableBillManagementService payableBillManagementService;
+ @Resource
+ private SysConfigMapper sysConfigMapper;
/**
* 鏌ヨ搴斾粯璐圭敤绠＄悊
@@ -49,7 +67,15 @@
@Override
public PayableFeeManagement selectPayableFeeManagementById(Integer id)
{
- return payableFeeManagementMapper.selectPayableFeeManagementById(id);
+ PayableFeeManagement payableFeeManagement = payableFeeManagementMapper.selectPayableFeeManagementById(id);
+ if (payableFeeManagement != null) {
+ // 鏌ヨ瀵瑰簲鐨勮垂鐢ㄦ槑缁�
+ PayableFeeDetail detail = new PayableFeeDetail();
+ detail.setPayableFeeId(id);
+ List<PayableFeeDetail> detailList = payableFeeDetailService.selectPayableFeeDetailList(detail);
+ payableFeeManagement.setPayableFeeDetailList(detailList);
+ }
+ return payableFeeManagement;
}
/**
@@ -197,4 +223,180 @@
{
return payableFeeManagementMapper.deletePayableFeeManagementById(id);
}
+
+ /**
+ * 鏌ヨ搴斾粯璐圭敤缁熻淇℃伅
+ *
+ * @param ids 搴斾粯璐圭敤绠＄悊ID鏁扮粍
+ * @return 搴斾粯璐圭敤缁熻缁撴灉
+ */
+ @Override
+ public PayableFeeStatisticsVo getPayableFeeStatistics(Integer[] ids)
+ {
+ PayableFeeStatisticsVo statisticsVo = new PayableFeeStatisticsVo();
+
+ // 鏌ヨ閫変腑鐨勫簲浠樿垂鐢ㄨ褰�
+ List<PayableFeeManagement> feeList = payableFeeManagementMapper.selectPayableFeeManagementByIds(ids);
+
+ if (feeList.isEmpty()) {
+ return statisticsVo;
+ }
+
+ // 妫�鏌ヤ緵搴斿晢鍚嶇О鏄惁涓�鑷�
+ String supplierName = feeList.get(0).getSupplierName();
+ for (PayableFeeManagement fee : feeList) {
+ if (!supplierName.equals(fee.getSupplierName())) {
+ throw new RuntimeException("鎵�閫夎褰曠殑渚涘簲鍟嗗悕绉颁笉涓�鑷达紝鏃犳硶杩涜缁熻");
+ }
+ }
+ // 璁＄畻鍗曟嵁鏁伴噺
+ int documentCount = feeList.size();
+ SysConfig sysConfig = sysConfigMapper.selectConfig(new SysConfig() {{
+ setConfigKey("sys.hk.rmb.rate");
+ }});
+ // 璁剧疆鍗曟嵁鏁伴噺
+ 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);
+
+ return statisticsVo;
+ }
+
+ /**
+ * 鍒涘缓搴斾粯璐﹀崟
+ *
+ * @param billCreateVo 搴斾粯璐﹀崟鍒涘缓璇锋眰VO
+ * @return 缁撴灉
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int createPayableBill(PayableBillCreateVo billCreateVo)
+ {
+ // 鑾峰彇搴斾粯璐圭敤缁熻鏁版嵁
+ PayableFeeStatisticsVo statisticsVo = billCreateVo.getStatisticsData();
+ Integer[] ids = statisticsVo.getIds();
+
+ // 鏌ヨ閫変腑鐨勫簲浠樿垂鐢ㄨ褰�
+ List<PayableFeeManagement> feeList = payableFeeManagementMapper.selectPayableFeeManagementByIds(ids);
+
+ if (feeList.isEmpty()) {
+ throw new RuntimeException("鏈壘鍒版湁鏁堢殑搴斾粯璐圭敤璁板綍");
+ }
+
+ // 妫�鏌ョ姸鎬侊紝鍙湁鐘舵�佷负0鐨勮褰曞彲浠ュ垱寤鸿处鍗�
+ for (PayableFeeManagement fee : feeList) {
+ if (!"0".equals(fee.getStatus())) {
+ throw new RuntimeException("鍙兘閫夋嫨鐘舵�佷负0鐨勫簲浠樿垂鐢ㄨ褰曞垱寤鸿处鍗�");
+ }
+ }
+
+ // 鍒涘缓搴斾粯璐﹀崟绠＄悊瀵硅薄
+ PayableBillManagement bill = new PayableBillManagement();
+ bill.setBillName(billCreateVo.getBillName());
+ bill.setSupplierName(billCreateVo.getSupplierName());
+ bill.setIsInternalSettlement(billCreateVo.getIsInternalSettlement());
+ bill.setInternalSettlementUnit(billCreateVo.getInternalSettlementUnit());
+ bill.setDocumentCount(statisticsVo.getDocumentCount());
+ bill.setExchangeRate(statisticsVo.getRate());
+ bill.setStatus("0"); // 鑽夌鐘舵��
+ bill.setCreateTime(DateUtils.getNowDate());
+
+ // 鏍规嵁璐﹀崟绫诲瀷璁剧疆甯佺鍜屾�婚噾棰�
+ if (billCreateVo.getBillType() == 0) {
+ // 浜烘皯甯佽处鍗�
+ bill.setCurrency("CNY");
+ bill.setTotalAmount(statisticsVo.getTotalAmountRmb());
+ bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
+ } else {
+ // 娓竵璐﹀崟
+ bill.setCurrency("HKD");
+ bill.setTotalAmount(statisticsVo.getTotalAmountHkd());
+ bill.setCnyAmount(statisticsVo.getTotalAmountRmb());
+ }
+
+ // 淇濆瓨搴斾粯璐﹀崟璁板綍
+ int result = payableBillManagementService.insertPayableBillManagement(bill);
+
+ if (result > 0) {
+ // 鎵归噺鏇存柊搴斾粯璐圭敤涓昏〃锛岃缃叧鑱旇处鍗曠紪鍙峰拰鐘舵��
+ for (PayableFeeManagement fee : feeList) {
+ fee.setRelatedBillNo(bill.getSystemNo());
+ fee.setStatus("1"); // 宸茬敓鎴愯处鍗曠姸鎬�
+ payableFeeManagementMapper.updatePayableFeeManagement(fee);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ PayableFeeManagementLog log = new PayableFeeManagementLog();
+ log.setPayableFeeId(fee.getId());
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鐢熸垚搴斾粯璐﹀崟锛岃处鍗曠紪鍙凤細" + bill.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertPayableFeeManagementLog(log);
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * 浣滃簾搴斾粯璐圭敤绠＄悊璁板綍
+ *
+ * @param id 搴斾粯璐圭敤绠＄悊ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int voidPayableFeeManagement(Integer id)
+ {
+ // 鏌ヨ搴斾粯璐圭敤璁板綍
+ PayableFeeManagement payableFeeManagement = payableFeeManagementMapper.selectPayableFeeManagementById(id);
+
+ if (payableFeeManagement == null) {
+ throw new RuntimeException("搴斾粯璐圭敤璁板綍涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ョ姸鎬侊紝鍙湁鐘舵�佷负0鐨勮褰曞彲浠ヤ綔搴�
+ if (!"0".equals(payableFeeManagement.getStatus())) {
+ throw new RuntimeException("鍙兘浣滃簾鐘舵�佷负0鐨勫簲浠樿垂鐢ㄨ褰�");
+ }
+
+ // 璁剧疆鐘舵�佷负2锛堜綔搴燂級
+ payableFeeManagement.setStatus("2");
+ payableFeeManagement.setUpdateTime(DateUtils.getNowDate());
+
+ int result = payableFeeManagementMapper.updatePayableFeeManagement(payableFeeManagement);
+
+ if (result > 0) {
+ // 璁板綍鎿嶄綔鏃ュ織
+ PayableFeeManagementLog log = new PayableFeeManagementLog();
+ log.setPayableFeeId(id);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("浣滃簾搴斾粯璐圭敤璁板綍锛岀郴缁熺紪鍙凤細" + payableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertPayableFeeManagementLog(log);
+ }
+
+ return result;
+ }
}
+
+
--
Gitblit v1.8.0