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

zhangback

7 天以前 ca412ade3b178fbc8ba0a4b6215a040acdede954

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

@@ -13,10 +13,12 @@
import javax.annotation.Resource;

import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
import com.ruoyi.tms.domain.TmsDispatchOrder;
import com.ruoyi.tms.domain.TmsFinance;
import com.ruoyi.tms.domain.vo.FinanceDetailItem;
import com.ruoyi.tms.mapper.TmsDispatchOrderMapper;
import com.ruoyi.tms.mapper.TmsFinanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -158,6 +160,28 @@
                .ne(TmsFinance::getStatus, 2)
                .last("limit 1")
        );


        if (StringUtils.isNotEmpty(tmsFinanceDetail.getFeeType())){
            addItem(tmsFinance, 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);
            });
        }
        return 1;
    }


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

            TmsDispatchOrder tmsDispatchOrder = tmsDispatchOrderMapper.selectTmsDispatchOrderById(tmsFinanceDetail.getDispatchOrderId());
@@ -189,7 +213,7 @@
        tmsFinanceDetail.setCreateId(SecurityUtils.getUserId());
        tmsFinanceDetail.setFeeCreateTime(DateUtils.getNowDate());
        tmsFinanceDetail.setCreateTime(DateUtils.getNowDate());
        return tmsFinanceDetailMapper.insertTmsFinanceDetail(tmsFinanceDetail);
        tmsFinanceDetailMapper.insertTmsFinanceDetail(tmsFinanceDetail);
    }

    /**