From f656483a233cb1213c85f32c6b4f81d71bd4db4c Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 18 十一月 2025 11:59:19 +0800
Subject: [PATCH] 提交
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
index 8033882..4ca6cdb 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java
@@ -1,10 +1,13 @@
package com.ruoyi.tms.service.impl;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.List;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
@@ -162,7 +165,9 @@
throw new RuntimeException("鏈壘鍒板搴旂殑璋冨害鍗�");
}
tmsFinance = BeanUtil.copyProperties(tmsDispatchOrder,TmsFinance.class);
- tmsFinance.setSystemCode(systemDataNoService.getNoByKey(SystemDataNoEnum.OF));
+ SystemDataNoEnum systemDataNoEnum = tmsFinanceDetail.getFinanceType() == 0 ? SystemDataNoEnum.YFD :
+ tmsFinanceDetail.getFinanceType() == 1 ? SystemDataNoEnum.YSD : SystemDataNoEnum.OF;
+ tmsFinance.setSystemCode(systemDataNoService.getNoByKey(systemDataNoEnum));
tmsFinance.setDispatchId(tmsFinanceDetail.getDispatchOrderId());
tmsFinance.setType(tmsFinanceDetail.getFinanceType());
tmsFinance.setStatus(0);
@@ -209,8 +214,61 @@
@Override
public int updateTmsFinanceDetail(TmsFinanceDetail tmsFinanceDetail)
{
+ Integer financeId = tmsFinanceDetail.getFinanceId();
+ TmsFinance tmsFinance = tmsFinanceMapper.selectTmsFinanceById(financeId);
+ if (tmsFinance == null){
+ throw new RuntimeException("鏈壘鍒板搴旂殑璐圭敤鍗�");
+ }
+ tmsFinanceDetail.setUpdateBy(SecurityUtils.getUsername());
tmsFinanceDetail.setUpdateTime(DateUtils.getNowDate());
- return tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetail);
+ tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetail);
+ // 鏌ヨ璇ヨ垂鐢ㄥ崟涓嬫墍鏈夌姸鎬佷负0鐨勮垂鐢ㄦ槑缁嗙殑瀹為檯璐圭敤閲戦鎬诲拰
+ List<TmsFinanceDetail> detailList = tmsFinanceDetailMapper.selectList(new LambdaQueryWrapper<TmsFinanceDetail>()
+ .eq(TmsFinanceDetail::getFinanceId, financeId)
+ .eq(TmsFinanceDetail::getStatus, 0)
+ );
+ // 璁＄畻鎬诲拰
+ // 璁＄畻鎬诲拰
+ double totalAmount = detailList.stream()
+ .mapToDouble(detail -> detail.getActualFeeAmount().doubleValue())
+ .sum();
+
+ TmsFinance tmsFinance1 = new TmsFinance() {{
+ setId(financeId);
+ setTotalAmount(new BigDecimal(totalAmount));
+ }};
+ return tmsFinanceMapper.updateTmsFinance(tmsFinance1);
+ }
+
+ @Override
+ public AjaxResult cancelFinanceDetail(Integer id) {
+
+ TmsFinanceDetail tmsFinanceDetail = tmsFinanceDetailMapper.selectById(id);
+ if (tmsFinanceDetail == null){
+ return AjaxResult.error("鏈壘鍒板搴旂殑璐圭敤鏄庣粏");
+ }
+ tmsFinanceDetail.setStatus(1);
+ tmsFinanceDetail.setUpdateBy(SecurityUtils.getUsername());
+ tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetail);
+
+
+ // 鏌ヨ璇ヨ垂鐢ㄥ崟涓嬫墍鏈夌姸鎬佷负0鐨勮垂鐢ㄦ槑缁嗙殑瀹為檯璐圭敤閲戦鎬诲拰
+ List<TmsFinanceDetail> detailList = tmsFinanceDetailMapper.selectList(new LambdaQueryWrapper<TmsFinanceDetail>()
+ .eq(TmsFinanceDetail::getFinanceId, tmsFinanceDetail.getFinanceId())
+ .eq(TmsFinanceDetail::getStatus, 0)
+ );
+ // 璁＄畻鎬诲拰
+ // 璁＄畻鎬诲拰
+ double totalAmount = detailList.stream()
+ .mapToDouble(detail -> detail.getActualFeeAmount().doubleValue())
+ .sum();
+
+ TmsFinance tmsFinance1 = new TmsFinance() {{
+ setId( tmsFinanceDetail.getFinanceId());
+ setTotalAmount(new BigDecimal(totalAmount));
+ }};
+ tmsFinanceMapper.updateTmsFinance(tmsFinance1);
+ return AjaxResult.success("鍙栨秷鎴愬姛");
}
/**
--
Gitblit v1.8.0