新增字段

wujianwei

2026-01-14 7733884bbd7717c4b017f5597b813bd66e1e22b4

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

@@ -15,6 +15,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.cwgl.domain.*;
import com.ruoyi.cwgl.domain.dto.CallbackReceiptDto;
import com.ruoyi.cwgl.service.IInvoiceBillDetailService;
import com.ruoyi.cwgl.service.IInvoiceBusinessService;
import com.ruoyi.system.service.ISystemDataNoService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@
    private InvoiceBillDetailMapper invoiceBillDetailMapper;

    @Resource
    private IInvoiceBillDetailService invoiceBillDetailService;

    @Resource
    private IInvoiceManageLogService invoiceManageLogService;

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

    @Autowired
    private IInvoiceBusinessService invoiceBusinessService;
    /**
     * 查询发票管理
     *
@@ -176,7 +181,11 @@
    @Override
    public int updateInvoiceManage(InvoiceManage invoiceManage) {
        invoiceManage.setUpdateTime(DateUtils.getNowDate());
        // 删除原有的发票明细
        invoiceManageMapper.deleteInvoiceDetailByInvoiceManageId(invoiceManage.getId());
        // 删除原有的发票业务商品明细
        invoiceBillDetailService.deleteInvoiceBillDetailByInvoiceManageId(invoiceManage.getId());
        // 插入新的明细记录
        insertInvoiceDetail(invoiceManage);
        int rows = invoiceManageMapper.updateInvoiceManage(invoiceManage);

@@ -377,8 +386,8 @@
        for (InvoiceBillDetail billingDetail : invoiceBillDetails) {
            InvoiceDetailApi invoiceDetail = new InvoiceDetailApi();


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

            invoiceDetail.setWithTaxFlag(billingDetail.getWithTaxFlag().toString());
            invoiceDetail.setTaxRate("0.06");
@@ -392,7 +401,10 @@
        order.setInvoiceDetail(invoiceDetailList);
        invoicingVo.setOrder(order);
        String body = JSONObject.toJSONString(invoicingVo);
        String json = HttpUtil.post(invoicingAddress + "?businessType=" + businessType + "&returnUrl=" + returnAddress, body);
        String urlString = invoicingAddress + "?businessType=" + businessType + "&returnUrl=" + returnAddress;
        logger.info("请求body{}",body);
        logger.info("请求地址{}",urlString);
        String json = HttpUtil.post(urlString, body);

        if (json == null) {
            logger.info("开票失败");
@@ -400,7 +412,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));
@@ -414,8 +426,11 @@
            logger.info("开票成功发票序列号为{}", invoiceSerialNum);
            record.setInvoiceSerialNum(invoiceSerialNum);
            record.setInvoiceManageId(invoiceManage.getId());
            invoiceBusinessService.insertInvoiceBusiness(record);
            return AjaxResult.success();
        }


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