Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2026-03-10 68b27795ae929f5300fc6fb301b31aada74a2e2f

 tms/src/main/java/com/ruoyi/tms/service/impl/TmsFinanceDetailServiceImpl.java

@@ -2,6 +2,7 @@

import java.math.BigDecimal;
import java.util.Collections;
import java.util.Date;
import java.util.List;

import cn.hutool.core.bean.BeanUtil;
@@ -9,6 +10,7 @@
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.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;

@@ -183,8 +185,10 @@

    @Override
    public int saveTmsFinanceDetail(TmsFinanceDetail tmsFinanceDetail) {
        insertTmsFinanceDetail(tmsFinanceDetail);

        if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType() ) &&
                tmsFinanceDetail.getActualFeeAmount() != null){
            insertTmsFinanceDetail(tmsFinanceDetail);
        }
        List<FinanceDetailRow> rowItems = tmsFinanceDetail.getRowItems();
        if (rowItems != null && !rowItems.isEmpty()){

@@ -192,6 +196,10 @@
                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);
@@ -202,6 +210,28 @@

    }

    @Override
    public int saveTmsFinanceDetail2(List<TmsFinanceDetail> tmsFinanceDetails) {
        String username = SecurityUtils.getUsername();
        Long userId = SecurityUtils.getUserId();
        Date nowDate = DateUtils.getNowDate();
        for (TmsFinanceDetail tmsFinanceDetail : tmsFinanceDetails) {
            if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType() ) &&
                    tmsFinanceDetail.getActualFeeAmount() != null) {
                tmsFinanceDetail.setCreateBy(username);
                tmsFinanceDetail.setInitialFeeAmount(tmsFinanceDetail.getActualFeeAmount());
                tmsFinanceDetail.setCreateId(userId);
                tmsFinanceDetail.setFeeCreateTime(nowDate);
                tmsFinanceDetail.setCreateTime(nowDate);
            }else {
                throw new ServiceException("金额或者费用类型不能为空");
            }
        }

        return tmsFinanceDetailMapper.insertTmsFinanceDetailBatch(tmsFinanceDetails);

    }

    public void addItem (TmsFinanceDetail tmsFinanceDetail){
//        if (tmsFinance == null){
//