修改发票新增

wujianwei

2026-01-12 acfe8943be0bb1440e0e6ba27ad9e694859e835e

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

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

import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;

import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.http.HttpUtil;
@@ -33,6 +31,7 @@
import com.ruoyi.common.core.service.BaseService;

import com.ruoyi.cwgl.mapper.InvoiceManageMapper;
import com.ruoyi.cwgl.mapper.InvoiceBillDetailMapper;
import com.ruoyi.cwgl.service.IInvoiceManageService;
import com.ruoyi.cwgl.service.IInvoiceManageLogService;
import com.ruoyi.common.core.text.Convert;
@@ -51,6 +50,9 @@
    private InvoiceManageMapper invoiceManageMapper;

    @Resource
    private InvoiceBillDetailMapper invoiceBillDetailMapper;

    @Resource
    private IInvoiceManageLogService invoiceManageLogService;

    @Autowired
@@ -67,7 +69,8 @@
    private String invoicingAddress;
    @Value("${custom.gdpaasApi.returnAddress}")
    private String returnAddress;

    @Autowired
    private IInvoiceBusinessService invoiceBusinessService;
    /**
     * 查询发票管理
     *
@@ -263,6 +266,20 @@
                invoiceManageMapper.batchInvoiceDetail(list);
            }
        }
        
        // 新增发票业务商品明细信息
        List<InvoiceBillDetail> invoiceBillDetails = invoiceManage.getInvoiceBillDetails();
        if (StringUtils.isNotNull(invoiceBillDetails)) {
            List<InvoiceBillDetail> billDetailList = new ArrayList<InvoiceBillDetail>();
            for (InvoiceBillDetail invoiceBillDetail : invoiceBillDetails) {
                invoiceBillDetail.setInvoiceManageId(id);
                invoiceBillDetail.setCreateTime(new Date());
                billDetailList.add(invoiceBillDetail);
            }
            if (billDetailList.size() > 0) {
                invoiceBillDetailMapper.insertInvoiceBillDetailBatch(billDetailList);
            }
        }
    }

    /**
@@ -310,7 +327,7 @@
    }

    @Override
    public AjaxResult applyInvoice(Integer id, List<InvoiceBillDetail> invoiceBillDetails) {
    public AjaxResult applyInvoice(Integer id) {
        InvoiceManage invoiceManage = selectInvoiceManageById(id);
        if (invoiceManage == null) {
            throw new ServiceException("发票记录不存在");
@@ -319,13 +336,16 @@
            throw new ServiceException("请勿重复开票");

        }
        List<InvoiceDetail> invoiceDetailList = invoiceManage.getInvoiceDetailList();
        if (CollectionUtil.isEmpty(invoiceDetailList)) {
            throw new ServiceException("收费明细无数据");
        List<InvoiceBillDetail> invoiceBillDetails = invoiceManage.getInvoiceBillDetails();
        if (CollectionUtil.isEmpty(invoiceBillDetails)) {
            throw new ServiceException("商品明细无数据无法开发票");

        }
        componentInvoice(invoiceManage.getInvoiceNo(),"FP",invoiceManage,invoiceBillDetails);
        return AjaxResult.success("申请开票成功");

        // 记录申请开票日志
        recordApplyInvoiceLog(invoiceManage);

        return  componentInvoice(invoiceManage.getInvoiceNo(),"FP",invoiceManage,invoiceBillDetails);
    }

    public AjaxResult componentInvoice(String orderNo, String businessType, InvoiceManage invoiceManage, List<InvoiceBillDetail> invoiceBillDetails) {
@@ -358,7 +378,7 @@
        for (InvoiceBillDetail billingDetail : invoiceBillDetails) {
            InvoiceDetailApi invoiceDetail = new InvoiceDetailApi();


            invoiceDetail.setGoodsCode(invoiceDetail.getGoodsCode());
            invoiceDetail.setGoodsName(invoiceDetail.getGoodsName());

            invoiceDetail.setWithTaxFlag(billingDetail.getWithTaxFlag().toString());
@@ -381,7 +401,7 @@
        }
        JSONObject jsonObject = JSONObject.parseObject(json);
        String code = jsonObject.getString("code");

        logger.info("开票返回{}",jsonObject);
        String invoiceSerialNum = null;
        InvoiceBusiness record = new InvoiceBusiness();
        record.setReqData(JSONObject.toJSONString(invoicingVo));
@@ -395,8 +415,11 @@
            logger.info("开票成功发票序列号为{}", invoiceSerialNum);
            record.setInvoiceSerialNum(invoiceSerialNum);
            record.setInvoiceManageId(invoiceManage.getId());
            invoiceBusinessService.insertInvoiceBusiness(record);
            return AjaxResult.success();
        }


        return AjaxResult.error("开票失败");
    }

@@ -470,3 +493,6 @@
        }
    }
}