修改接口

wujianwei

2025-09-04 a6c2271fc67508c41f680856e24744e4eebb78c0

 service/src/main/java/com/ruoyi/cwgl/service/impl/DispatchOrderServiceImpl.java

@@ -1,6 +1,10 @@
package com.ruoyi.cwgl.service.impl;

import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.math.BigDecimal;
@@ -12,7 +16,13 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.PageUtil;
import com.github.pagehelper.Page;
import com.itextpdf.text.Document;
import com.itextpdf.text.Font;
import com.itextpdf.text.PageSize;
import com.itextpdf.text.pdf.BaseFont;
import com.itextpdf.text.pdf.PdfWriter;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
@@ -23,6 +33,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.cwgl.domain.vo.DispatchOrderVo;
import com.ruoyi.cwgl.enums.FeeTypeEnums;
import com.ruoyi.cwgl.utils.MultiPagePdfWithImageUtils;
import org.springframework.beans.factory.annotation.Autowired;

import com.ruoyi.cwgl.domain.DispatchOrderItem;
@@ -284,50 +295,35 @@
    @DataSource(DataSourceType.CWSJ)
    public List<DispatchOrderItemVo> selectDispatchOrderItems( Set<String> nos) {
        // 使用Map来临时存储分组结果
        Map<String, DispatchOrderItemVo> summaryMap = new HashMap<>();

        List<DispatchOrderItemVo> vos = new ArrayList<>();
        List<DispatchOrderItem> dispatchOrderItems=dispatchOrderMapper.selectDispatchOrderItemByNos(nos);
        Set<String> settableFeeItemSet = null;
        for (DispatchOrderItem dispatchOrderItem : dispatchOrderItems) {
            String settableFeeItems = dispatchOrderItem.getSettableFeeItems();
            if (settableFeeItemSet==null) {
                settableFeeItemSet = new HashSet<>(
                        Arrays.asList(settableFeeItems.split(",")));
            }
            HashSet<String> settableFeeItemSet = new HashSet<>(
                    Arrays.asList(Optional.ofNullable(dispatchOrderItem.getSettableFeeItems()).orElse("").split(",")));

            // 判断是否可结算
            String feeItem = dispatchOrderItem.getFeeItem();
            int isSettable = isFeeItemSettable(feeItem, settableFeeItemSet);
            String feeItem = Optional.ofNullable(dispatchOrderItem.getFeeItem()).orElse("");
            int isSettable = settableFeeItemSet.contains(feeItem)?1:0;
            // 如果Map中不存在该费用类型，则创建新条目
            if (!summaryMap.containsKey(feeItem)) {

                DispatchOrderItemVo summary = new DispatchOrderItemVo();
                summary.setDispatchNo(dispatchOrderItem.getDispatchNo());
                summary.setFeeItem(feeItem);
                summary.setReceivableFee(BigDecimal.ZERO);
                summary.setActualFee(BigDecimal.ZERO);
                summary.setIsSettlement(isSettable);
                summaryMap.put(feeItem, summary);
            }
            // 根据账单类型累加金额
            DispatchOrderItemVo summary = summaryMap.get(feeItem);

            if ("R".equals(dispatchOrderItem.getBillType())) { // 应收
                summary.setReceivableFee(summary.getReceivableFee().add(dispatchOrderItem.getSettleFee()));
                summary.setReceivableFee(dispatchOrderItem.getSettleFee());
                summary.setReceivableFeeCurrency(dispatchOrderItem.getCurrencyType());
            } else if ("P".equals(dispatchOrderItem.getBillType())) { // 应付
                summary.setActualFee(summary.getActualFee().add(dispatchOrderItem.getSettleFee()));
                summary.setActualFee(dispatchOrderItem.getSettleFee());
                summary.setActualFeeCurrency(dispatchOrderItem.getCurrencyType());

            }
            vos.add( summary);
        }
        // 转换为List并过滤、排序
        return summaryMap.values().stream()
                // 过滤掉应收应付都为0的记录
                .filter(dto -> dto.getReceivableFee().compareTo(BigDecimal.ZERO) != 0
                        || dto.getActualFee().compareTo(BigDecimal.ZERO) != 0)
                // 排序：可结算的在前，不可结算的在后；然后按总金额降序
                .sorted(Comparator.comparing(DispatchOrderItemVo::getIsSettlement).reversed()
                        .thenComparing(dto -> dto.getReceivableFee().add(dto.getActualFee()),
                                Comparator.reverseOrder()))
                .collect(Collectors.toList());
        return vos;
    }


@@ -491,4 +487,15 @@
    public List<DispatchOrderAttachmentVo> selectDispatchOrderAttachment(String no) {
        return dispatchOrderMapper.selectDispatchOrderAttachment(no);
    }

    @DataSource(DataSourceType.CWSJ)
    @Override
    public String  downAttachment(String no) throws Exception {
        List<DispatchOrderAttachmentVo> dispatchOrderAttachmentVos = selectDispatchOrderAttachment(no);
        return MultiPagePdfWithImageUtils.createPdf(dispatchOrderAttachmentVos, no);
    }




}