From db8e73b120963810d6febdb939612db12d26996e Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期四, 18 十二月 2025 14:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 46 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 ce3bc60..ce326d6 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
@@ -19,6 +19,7 @@
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinance;
import com.ruoyi.tms.domain.vo.FinanceDetailItem;
+import com.ruoyi.tms.domain.vo.FinanceDetailRow;
import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -154,60 +155,86 @@
@Override
public int insertTmsFinanceDetail(TmsFinanceDetail tmsFinanceDetail)
{
- TmsFinance tmsFinance = tmsFinanceMapper.selectOne(new LambdaQueryWrapper<TmsFinance>()
- .eq(TmsFinance::getType, tmsFinanceDetail.getFinanceType())
- .eq(TmsFinance::getDispatchId, tmsFinanceDetail.getDispatchOrderId())
- .ne(TmsFinance::getStatus, 2)
- .last("limit 1")
- );
+// TmsFinance tmsFinance = tmsFinanceMapper.selectOne(new LambdaQueryWrapper<TmsFinance>()
+// .eq(TmsFinance::getType, tmsFinanceDetail.getFinanceType())
+// .eq(TmsFinance::getDispatchId, tmsFinanceDetail.getDispatchOrderId())
+// .ne(TmsFinance::getStatus, 2)
+// .last("limit 1")
+// );
- if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType())){
- addItem(tmsFinance, tmsFinanceDetail);
- }
+ //if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType())){
+ addItem(tmsFinanceDetail);
+ // }
// 1銆佹煡璇㈠綋鍓嶈皟搴﹀崟瀵瑰簲鐨勮垂鐢�
- List<FinanceDetailItem> items = tmsFinanceDetail.getItems();
-
- if (items != null && !items.isEmpty()){
- items.forEach(item->{
- TmsFinanceDetail tmsFinanceDetailNew = BeanUtil.copyProperties(tmsFinanceDetail, TmsFinanceDetail.class);
- BeanUtil.copyProperties(item, tmsFinanceDetailNew);
- tmsFinanceDetailNew.setActualFeeAmount(item.getPrice().multiply(BigDecimal.valueOf(item.getCount())));
- addItem(tmsFinance, tmsFinanceDetailNew);
- });
- }
+// List<FinanceDetailItem> items = tmsFinanceDetail.getItems();
+//
+// if (items != null && !items.isEmpty()){
+// items.forEach(item->{
+// TmsFinanceDetail tmsFinanceDetailNew = BeanUtil.copyProperties(tmsFinanceDetail, TmsFinanceDetail.class);
+// BeanUtil.copyProperties(item, tmsFinanceDetailNew);
+// tmsFinanceDetailNew.setActualFeeAmount(item.getPrice().multiply(BigDecimal.valueOf(item.getCount())));
+// addItem(tmsFinance, tmsFinanceDetailNew);
+// });
+// }
return 1;
}
-
- public void addItem (TmsFinance tmsFinance, TmsFinanceDetail tmsFinanceDetail){
- if (tmsFinance == null){
-
- TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(tmsFinanceDetail.getDispatchOrderId());
- if (tmsDispatchOrder == null){
- throw new RuntimeException("鏈壘鍒板搴旂殑璋冨害鍗�");
- }
- tmsFinance = BeanUtil.copyProperties(tmsDispatchOrder,TmsFinance.class);
- 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);
- tmsFinance.setTotalAmount(tmsFinanceDetail.getActualFeeAmount());
- tmsFinance.setCreateBy(SecurityUtils.getUsername());
- tmsFinance.setUpdateBy(SecurityUtils.getUsername());
- tmsFinance.setCreateTime(DateUtils.getNowDate());
- tmsFinance.setUpdateTime(DateUtils.getNowDate());
- // 娣诲姞璐圭敤涓昏〃
- tmsFinanceMapper.insertTmsFinance(tmsFinance);
- }else{
- tmsFinance.setTotalAmount(tmsFinance.
- getTotalAmount().add(tmsFinanceDetail.getActualFeeAmount()));
- tmsFinanceMapper.updateTmsFinance(tmsFinance);
+ @Override
+ public int saveTmsFinanceDetail(TmsFinanceDetail tmsFinanceDetail) {
+ if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType() ) &&
+ tmsFinanceDetail.getActualFeeAmount() != null){
+ insertTmsFinanceDetail(tmsFinanceDetail);
}
- tmsFinanceDetail.setFinanceId(tmsFinance.getId());
+ List<FinanceDetailRow> rowItems = tmsFinanceDetail.getRowItems();
+ if (rowItems != null && !rowItems.isEmpty()){
+
+ for (FinanceDetailRow rowItem : rowItems){
+ if (rowItem.getIsYF() != null && rowItem.getIsYF() == 0){
+ rowItem.setYfPrice(null);
+ rowItem.setYfCurrency(null);
+ rowItem.setYfServiceProviderId(null);
+ rowItem.setYfServiceProviderType(null);
+ rowItem.setYfServiceProviderIdType(null);
+ rowItem.setYfServiceProviderName(null);
+ }
+ TmsFinanceDetail tmsFinanceDetailNew = BeanUtil.copyProperties(rowItem, TmsFinanceDetail.class);
+ tmsFinanceDetailMapper.updateTmsFinanceDetail(tmsFinanceDetailNew);
+ }
+ }
+ return 1;
+
+
+ }
+
+ public void addItem (TmsFinanceDetail tmsFinanceDetail){
+// if (tmsFinance == null){
+//
+// TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(tmsFinanceDetail.getDispatchOrderId());
+// if (tmsDispatchOrder == null){
+// throw new RuntimeException("鏈壘鍒板搴旂殑璋冨害鍗�");
+// }
+// tmsFinance = BeanUtil.copyProperties(tmsDispatchOrder,TmsFinance.class);
+// 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);
+// tmsFinance.setTotalAmount(tmsFinanceDetail.getActualFeeAmount());
+// tmsFinance.setCreateBy(SecurityUtils.getUsername());
+// tmsFinance.setUpdateBy(SecurityUtils.getUsername());
+// tmsFinance.setCreateTime(DateUtils.getNowDate());
+// tmsFinance.setUpdateTime(DateUtils.getNowDate());
+// // 娣诲姞璐圭敤涓昏〃
+// tmsFinanceMapper.insertTmsFinance(tmsFinance);
+// }else{
+// tmsFinance.setTotalAmount(tmsFinance.
+// getTotalAmount().add(tmsFinanceDetail.getActualFeeAmount()));
+// tmsFinanceMapper.updateTmsFinance(tmsFinance);
+// }
+ // tmsFinanceDetail.setFinanceId(tmsFinance.getId());
tmsFinanceDetail.setCreateBy(SecurityUtils.getUsername());
tmsFinanceDetail.setInitialFeeAmount(tmsFinanceDetail.getActualFeeAmount());
tmsFinanceDetail.setCreateId(SecurityUtils.getUserId());
--
Gitblit v1.8.0