feat:科室新增开票类型 水电房租标的物问题 机动车开票选项

shiyunteng

2026-08-24 9c49ede494a10d7e7a322eb2e793afa412ea07e1

feat:科室新增开票类型  水电房租标的物问题  机动车开票选项

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/GenInvoiceInfoDTO.java

@@ -14,4 +14,11 @@

    private String contractId;

    private String invoiceType;

    private String vehicleNo;

    private String certificateNo;

    private String vehicleData;
}

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/BusinessCustomer.java

@@ -91,6 +91,10 @@
    @Column(columnDefinition = "VARCHAR(40) comment '联系电话'")
    private String contactPhone;

    @Schema(description = "开票类型")
    @Column(columnDefinition = "VARCHAR(2) comment '开票类型 票 01:全电发票(增值税专用发票) 02:全电发票(普通发票)' ")
    private String invoiceType;

/*    @Schema(description = "邮箱")
    @Column(columnDefinition = "VARCHAR(50) comment '邮箱'")
    private String email;*/

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java

@@ -170,6 +170,10 @@
    @Column(columnDefinition="char comment '开票标识 0/未开 1/已开'")
    private String invoiceFlag;

    @Schema(description = "开票数量 水电专用")
    @Column(columnDefinition = "decimal(14,2) comment '开票数量 水电专用'")
    private BigDecimal invoiceNum;

//    @Schema(description = "排序号")
//    @Column(columnDefinition = "int default 0 comment '排序号'")
//    private Integer sortOrder;

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java

@@ -246,6 +246,9 @@
    @Schema(description = "简易合同附件名称")
    private String attachmentSimpleName;

    @Schema(description = "开票类型")
    private String invoiceType;

    private List<ContractPaymentSchedule> contractPaymentSchedule;

    private List<ContractSubjectMatter> contractSubjectMatter;

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractHouseWaterVo.java

@@ -19,6 +19,9 @@
    @Schema(description = "计划收款金额")
    private BigDecimal plannedAmount;

    @Schema(description = "开票数量")
    private BigDecimal invoiceNum;

    @Schema(description = "备注")
    private String remark;


 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java

@@ -185,4 +185,6 @@

    @Schema(description = "质保节点ID")
    private Long warrantyScheduleId;

    private String centerPushFlag;
}

 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/GenInvoiceInfoVo.java

@@ -15,6 +15,18 @@
    @Schema(description = "预开发票")
    private String advanceInvoice;

    @Schema(description = "车架号")
    private String vehicleNo;

    @Schema(description = "车辆合格证号")
    private String certificateNo;

    @Schema(description = "交税分类")
    private String invoiceType;

    @Schema(description = "机动车交税分类")
    private String invoiceVehicleType;

    @Schema(description = "甲方名称")
    private String partyA;

@@ -42,8 +54,13 @@
    @Schema(description = "开票金额（含税）")
    private BigDecimal totalPrice;

    @Schema(description = "税额")
    private BigDecimal totalTax;

    @Schema(description = "大写开票金额")
    private String priceWords;

    private String vehicleData;

    private List<InvoiceItemVo> invoiceItemList;
}

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java

@@ -77,6 +77,18 @@
    }

    /**
     * 通过id手动推送合同中心
     * @param id id
     * @return R
     */
    @Operation(summary = "通过id手动推送合同中心" , description = "通过id手动推送合同中心" )
    @GetMapping("/pushCenter/{id}" )
    public R pushCenter(@PathVariable("id" ) Long id) {
        return contractService.pushCenter(id);
    }


    /**
     * 新增合同管理
     * @param addDTO 合同管理
     * @return R

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java

@@ -66,4 +66,6 @@
    void exportContractJXCXSWord(Long id, HttpServletResponse response);

    R addSimple(ContractAddDTO addDTO);

    R pushCenter(Long id);
}

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java

@@ -40,10 +40,7 @@

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

@Slf4j
@@ -137,10 +134,11 @@

    @Override
    public R genInvoiceInfo(GenInvoiceInfoDTO genInvoiceInfoDTO) {
        if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
        if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
            return R.failed("请选择开票出库单后再操作");
        }
        Long contractId = null;
        //预收款开票
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
            ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                    .eq(ContractPaymentSchedule::getStageName, "合同签订").eq(ContractPaymentSchedule::getContractId,genInvoiceInfoDTO.getContractId())
@@ -174,6 +172,7 @@
            return R.ok(vo);
        }

        //正常产品开票
        if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
            ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
            contractId = outBound.getContractId();
@@ -190,9 +189,91 @@
            return R.failed("获取开票单位异常");
        }
        SysDept b = r.getData();
        //机动车开票
        if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"3")||StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"4")){
            if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())){
                return R.failed("机动车开票请输入车架号");
            }
            BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getInvoiceNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
            if (invoiceNumSum.compareTo(new BigDecimal("1"))>0){
                return R.failed("机动车开票只能1次开1辆");
            }
            JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(),b);
            R r1 = requestQueryVehicleNo(request);
            if (!r1.isOk()){
                return r1;
            }
            JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(),b);
            R r2 = requestQueryVehicleDetail(request1);
            if (!r2.isOk()){
                return r2;
            }
            genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
        }

        GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);

        return R.ok(vo);
    }

    private R requestQueryVehicleDetail(JSONObject request) {
        String requestId = IdUtil.fastUUID();

        log.info("机动车合格证查询接口入参：{},", request.toJSONString());
        String result = HttpUtil.post(bwUrl+"method=baiwang.output.invoice.queryVinDetail&version=1.0&request_id=" + requestId, request.toJSONString());
        log.info("机动车合格证查询接口回参：{},", result);
        saveBwRequestRecord("baiwang.output.invoice.queryVinDetail", requestId, request.toJSONString(), result);
        JSONObject resultObj = JSONObject.parseObject(result);
        if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                !resultObj.getBoolean("success")) {
            return R.failed("机动车合格证查询失败",result);
        }
        JSONArray models = resultObj.getJSONArray("model");
        if (CollUtil.isNotEmpty(models)){
            JSONObject model = (JSONObject) models.get(0);
            return R.ok(model);
        }
        return R.failed("机动车合格证查询异常");
    }

    private JSONObject genQueryVehDetailParam(String vehicleNo, SysDept b) {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("taxNo",b.getOrgCode());
        JSONObject data = new JSONObject();
        data.put("vehicleNo", vehicleNo);
        jsonObject.put("data",data);
        return jsonObject;
    }

    private R requestQueryVehicleNo(JSONObject request) {
        String requestId = IdUtil.fastUUID();

        log.info("查询税局车架号码入参：{},", request.toJSONString());
        String result = HttpUtil.post(bwUrl+"method=baiwang.output.einvoice.queryvinlist&version=1.0&request_id=" + requestId, request.toJSONString());
        log.info("查询税局车架号码回参：{},", result);
        saveBwRequestRecord("baiwang.output.einvoice.queryvinlist", requestId, request.toJSONString(), result);
        JSONObject resultObj = JSONObject.parseObject(result);
        if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                !resultObj.getBoolean("success")) {
            return R.failed("查询税局车架号码失败",result);
        }
        JSONArray models = resultObj.getJSONArray("model");
        if (CollUtil.isNotEmpty(models)){
            JSONObject model = (JSONObject) models.get(0);
            if (!model.getBoolean("isOpenInvoice")){
                return R.failed(model.getString("isNotOpenInvReason"));
            }
        }
        return R.ok();
    }

    private JSONObject genQueryVinParam(String vehicleNo,SysDept b) {
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("taxNo",b.getOrgCode());
        JSONObject data = new JSONObject();
        data.put("vinList", new ArrayList<String>(Arrays.asList(vehicleNo)));
        jsonObject.put("data",data);
        return jsonObject;
    }

    private GenInvoiceInfoVo genInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
@@ -206,6 +287,19 @@
        vo.setPartyBOrgCode(b.getOrgCode());
        vo.setPartyBOpenBank(b.getOrgBank());
        vo.setPartyBBankAccount(b.getOrgBankAccount());
        vo.setInvoiceType(a.getInvoiceType());
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getInvoiceType())) {
            vo.setInvoiceVehicleType(genInvoiceInfoDTO.getInvoiceType());
        }
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getVehicleNo())) {
            vo.setVehicleNo(genInvoiceInfoDTO.getVehicleNo());
        }
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getCertificateNo())) {
            vo.setCertificateNo(genInvoiceInfoDTO.getCertificateNo());
        }
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getVehicleData())) {
            vo.setVehicleData(genInvoiceInfoDTO.getVehicleData());
        }
        List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
        List<String> erpCode = new ArrayList<>();
        List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
@@ -229,19 +323,6 @@
                            mergeVo.setSpecification(product.getProductType());
                            mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
                            mergeVo.setTaxCode(product.getTaxCode());
                            Product productClass = productMapper.selectById(product.getParentId());
                            if (ObjUtil.isNotNull(product)) {
                                if (StrUtil.equals(product.getErpCode(), "water_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*水费");
                                } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*电费");
                                } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*房屋租赁");
                                } else {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*" + productClass.getProductName());
                                }

                            }
                        }
                        ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
                                .eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
@@ -249,6 +330,15 @@
                        if (ObjUtil.isNotNull(subjectMatter)) {
                            mergeVo.setUnitPrice(subjectMatter.getUnitPrice());
                            mergeVo.setUnit(subjectMatter.getUnit());
                            if (StrUtil.equals(product.getErpCode(), "water_bill")) {
                                mergeVo.setItemName("*" + product.getTaxClass() + "*水费");
                            } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
                                mergeVo.setItemName("*" + product.getTaxClass() + "*电费");
                            } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
                                mergeVo.setItemName("*" + product.getTaxClass() + "*房屋租赁");
                            } else {
                                mergeVo.setItemName("*" + product.getTaxClass() + "*" + subjectMatter.getMaterialName());
                            }
                        }
                        mergeOutBounds.add(mergeVo);
                    } else {
@@ -268,8 +358,10 @@
                        BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
                        invoiceItemVo.setPriceTax(itemPriceTax);
                        invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
                        invoiceItemVo.setPriceAndTax(itemPrice);
                    });
                    vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceTax().add(item.getPriceNoTax())).reduce(BigDecimal.ZERO, BigDecimal::add));
                    vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                    vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                    vo.setInvoiceItemList(invoiceItemVoList);
                    vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
                }
@@ -285,6 +377,7 @@
                        mergeVo.setMaterialCode(schedule.getSubjectMatterCode());
                        mergeVo.setMaterialInternalName(schedule.getSubjectMatterName());
                        mergeVo.setPriceAndTax(schedule.getPlannedAmount());
                        mergeVo.setQuantity(schedule.getInvoiceNum());
                        Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
                                .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
                        if (ObjUtil.isNotNull(product)) {
@@ -296,8 +389,10 @@
                            if (ObjUtil.isNotNull(product)) {
                                if (StrUtil.equals(product.getErpCode(), "water_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*水费");
                                    mergeVo.setUnit("吨");
                                } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*电费");
                                    mergeVo.setUnit("度");
                                } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*房屋租赁");
                                } else {
@@ -329,8 +424,10 @@
                        BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
                        invoiceItemVo.setPriceTax(itemPriceTax);
                        invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));

                    });
                    vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                    vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                    vo.setInvoiceItemList(invoiceItemVoList);
                    vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
                }
@@ -376,8 +473,10 @@
                            if (ObjUtil.isNotNull(product)) {
                                if (StrUtil.equals(product.getErpCode(), "water_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*水费");
                                    mergeVo.setUnit("吨");
                                } else if (StrUtil.equals(product.getErpCode(), "electricity_bill")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*电费");
                                    mergeVo.setUnit("度");
                                } else if (StrUtil.equals(product.getErpCode(), "house_rental")) {
                                    mergeVo.setItemName("*" + product.getTaxClass() + "*房屋租赁");
                                } else {
@@ -401,8 +500,10 @@
                    BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
                    invoiceItemVo.setPriceTax(itemPriceTax);
                    invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
                    invoiceItemVo.setPriceAndTax(itemPrice);
                });
                vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceTax().add(item.getPriceNoTax())).reduce(BigDecimal.ZERO, BigDecimal::add));
                vo.setTotalPrice(invoiceItemVoList.stream().map(item -> item.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
                vo.setInvoiceItemList(invoiceItemVoList);
                vo.setPriceWords(Convert.digitToChinese(vo.getTotalPrice()));
            }
@@ -415,6 +516,15 @@
    public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
        if (ArrayUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
            return R.failed("请选择开票出库单后再操作");
        }
        if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"3")||StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"4")){
            if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())){
                return R.failed("机动车开票请输入车架号");
            }
            BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getInvoiceNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
            if (invoiceNumSum.compareTo(new BigDecimal("1"))>0){
                return R.failed("机动车开票只能1次开1辆");
            }
        }
        Long contractId = null;
        if (StrUtil.isNotBlank(genInvoiceInfoDTO.getContractId())) {
@@ -486,6 +596,27 @@
            return R.failed("获取开票单位异常");
        }
        SysDept b = r.getData();
        //机动车开票
        if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"3")||StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(),"4")){
            if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())){
                return R.failed("机动车开票请输入车架号");
            }
            BigDecimal invoiceNumSum = genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getInvoiceNum()).reduce(BigDecimal.ZERO,BigDecimal::add);
            if (invoiceNumSum.compareTo(new BigDecimal("1"))>0){
                return R.failed("机动车开票只能1次开1辆");
            }
            JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(),b);
            R r1 = requestQueryVehicleNo(request);
            if (!r1.isOk()){
                return r1;
            }
            JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(),b);
            R r2 = requestQueryVehicleDetail(request1);
            if (!r2.isOk()){
                return r2;
            }
            genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
        }
        GenInvoiceInfoVo vo = genInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
        //发票保存
        ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "","0");
@@ -532,7 +663,7 @@
        bwRequestRecordMapper.insert(bwRequestRecord);
    }

    private JSONObject genBlueInvoice(GenInvoiceInfoVo vo, String serialNo) {
    private JSONObject genBlueInvoice(GenInvoiceInfoVo vo, String serialNo,SysDept dept) {
        JSONObject jsonObject = new JSONObject();
        //销方
        jsonObject.put("taxNo", vo.getPartyBOrgCode());//税号
@@ -541,7 +672,7 @@
        jsonObject.put("formatPushType", false);//版式生成是否推送(true / false)
        //data
        JSONObject data = new JSONObject();
        data.put("invoiceTypeCode", "01");
        data.put("invoiceTypeCode", vo.getInvoiceType());
        data.put("serialNo", serialNo);
        //data.invoiceDetailsList
        JSONArray invoiceDetailsList = new JSONArray();
@@ -557,6 +688,12 @@
            invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
            invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
//            invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
            if (StrUtil.equals(vo.getInvoiceVehicleType(),"3")){
                invoiceDetail.put("goodsSpecification", vo.getVehicleNo());
            }else {
                invoiceDetail.put("goodsSpecification", invoiceItemVo.getSpecification());
            }

            if (!StrUtil.equals(vo.getContractCategory(), "water_house")) {
                invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
            } else {
@@ -571,7 +708,7 @@
        //购方
        data.put("buyerTaxNo", vo.getPartyAOrgCode());
        data.put("buyerName", vo.getPartyA());
        data.put("drawer", SecurityUtils.getUser().getPhone());// TODO 税务总局系统登陆人手机号
        data.put("drawer", dept.getInvoiceContact());// TODO 税务总局系统登陆人手机号
        data.put("invoiceTotalPriceTax", vo.getTotalPrice());
        data.put("buyerBankName", vo.getPartyAOpenBank());
        data.put("buyerBankNumber", vo.getPartyABankAccount());
@@ -671,7 +808,7 @@
        jsonObject.put("sellerTaxName", blueInvoice.getSellerTaxName());
        jsonObject.put("buyerTaxName", blueInvoice.getBuyerTaxName());
        jsonObject.put("buyerTaxNo", blueInvoice.getBuyerTaxNo());
        jsonObject.put("originInvoiceDate", blueInvoice.getInvoiceTime());
        jsonObject.put("originInvoiceDate", DateUtil.formatDateTime(blueInvoice.getInvoiceTime()));
        jsonObject.put("originInvoiceTotalPrice", blueInvoice.getInvoiceTotalPrice());
        jsonObject.put("originInvoiceTotalTax", blueInvoice.getInvoiceTotalTax());
        jsonObject.put("invoiceTotalPrice", blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
@@ -896,20 +1033,52 @@
    @Override
    public void takeEffect(Long id) {
        ContractInvoice invoice = baseMapper.selectById(id);
        R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
        if (!r.isOk()){
            log.error("单位信息查询异常");
            return;
        }
        SysDept dept = r.getData();
        Contract contract = contractMapper.selectById(invoice.getContractId());
        GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(invoice.getInvoicePreview()), GenInvoiceInfoVo.class);
        vo.setContractCategory(contract.getContractCategory());
        invoice.setApprovalStatus("1");
        baseMapper.updateById(invoice);
        invoice.setBwRequestResult("0");

        //蓝票
        if (invoice.getInvoiceCategory().equals("1")) {
            // TODO 开蓝票接口
            JSONObject request = genBlueInvoice(vo, invoice.getSerialNo());
            // TODO 开蓝票接口机动车
            if (StrUtil.equals(vo.getInvoiceVehicleType(),"3")){
                JSONObject request = genBlueInvoiceVehicle(vo, invoice.getSerialNo(),dept);
                String requestId = IdUtil.fastUUID();
                invoice.setBwRequestId(requestId);
                invoice.setBwRequestParam(request.toJSONString());
                log.info("机动车发票开具请求接口入参:{}", request.toJSONString());
                String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.vehicleissue&version=1.0&requestId=" + requestId, request.toJSONString());
                log.info("机动车发票开具请求接口回参:{}", result);
                saveBwRequestRecord("baiwang.output.invoice.vehicleissue", requestId, request.toJSONString(), result);
                JSONObject resultObj = JSONObject.parseObject(result);
                if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                        resultObj.getBoolean("success")) {
                    log.info("开票成功！！！");
                    invoice.setBwRequestResult("1");
                }
                JSONObject modelJson = resultObj.getJSONObject("model");
                if (ObjUtil.isNotNull(modelJson)) {
                    Date invoiceDate = DateUtil.parse(modelJson.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
                    invoice.setInvoiceTime(invoiceDate);
                    invoice.setInvoiceNo(modelJson.getString("invoiceNo"));
                    //推送BIP
                    pushBipInvoice(invoice);
                }
            }

            // TODO 开蓝票接口 非机动车
            JSONObject request = genBlueInvoice(vo, invoice.getSerialNo(),dept);
            if (bwFlag) {
                String requestId = IdUtil.fastUUID();
                invoice.setBwRequestId(requestId);
                invoice.setBwRequestResult("1");
                invoice.setBwRequestParam(request.toJSONString());
                log.info("蓝票请求接口入参:{}", request.toJSONString());
                String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, request.toJSONString());
@@ -966,10 +1135,7 @@
                //判断 循环是否完成
                List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId, contract.getId())
                        .eq(ContractExecDate::getGenFlag, "0"));
                List<MeterReadRecord> recordList = meterReadRecordMapper.selectList(Wrappers.<MeterReadRecord>lambdaQuery()
                        .eq(MeterReadRecord::getContractId, contract.getId())
                        .isNull(MeterReadRecord::getMeterReadNum));
                if (ArrayUtil.isEmpty(execDateList) && ArrayUtil.isEmpty(recordList)) {
                if (CollUtil.isEmpty(execDateList)) {
                    //判断是否有可开票记录
                    List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
                            .eq(ContractPaymentSchedule::getContractId, contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag, "0"));
@@ -1090,6 +1256,56 @@

    }

    private JSONObject genBlueInvoiceVehicle(GenInvoiceInfoVo vo, String serialNo,SysDept dept) {
        JSONObject vechicleData = JSONObject.parseObject(vo.getVehicleData());
        JSONObject jsonObject = new JSONObject();
        //销方
        jsonObject.put("taxNo", vo.getPartyBOrgCode());//税号
        jsonObject.put("invoiceTerminalCode", "JDCwxj");//超过发票单张限额是否需要拆分开具，默认不拆分（拆分只支持发票类型代码为 专票 004 普票 007 电子票 026的
        jsonObject.put("formatGenerate", false);//是否需要生成版式返回版式链接(true / false)
        jsonObject.put("formatPushType", false);//版式生成是否推送(true / false)
        jsonObject.put("taxUserName", dept.getInvoiceContact());
        //data
        JSONObject data = new JSONObject();
        data.put("invoiceTypeCode", "03");
        data.put("invoiceType", "0");
        data.put("serialNo", serialNo);
        //data.invoiceDetailsList
        Integer lineNo = 1;
        JSONObject invoiceDetail = new JSONObject();

        invoiceDetail.put("vehicleNo", vo.getVehicleNo());
        invoiceDetail.put("manufacturingEnterprise","03");
        invoiceDetail.put("originPlace", vechicleData.getString("originPlace"));
        invoiceDetail.put("certificateNo",vo.getCertificateNo());
        invoiceDetail.put("engineNo",vechicleData.getString("engineNo"));
        invoiceDetail.put("tonnage",vechicleData.getString("tonnage"));
        invoiceDetail.put("passengersLimited",vechicleData.getString("passengersLimited"));
        invoiceDetail.put("brandModel",vechicleData.getString("brandModel"));

        invoiceDetail.put("goodsCode", vo.getInvoiceItemList().get(0).getTaxCode());
        invoiceDetail.put("goodsTaxRate", vo.getInvoiceItemList().get(0).getTaxRate().divide(new BigDecimal("100")));
        if (!StrUtil.equals(vo.getContractCategory(), "water_house")) {
            invoiceDetail.put("goodsTotalPrice", vo.getInvoiceItemList().get(0).getPriceNoTax());
        } else {
            invoiceDetail.put("goodsTotalPrice", vo.getInvoiceItemList().get(0).getPriceNoTax());
        }
        invoiceDetail.put("goodsTotalTax", vo.getInvoiceItemList().get(0).getPriceTax());
        data.put("invoiceVehicleInfo", invoiceDetail);
        //购方
        data.put("buyerTaxNo", vo.getPartyAOrgCode());
        data.put("buyerName", vo.getPartyA());
        data.put("sellerTaxNo", vo.getPartyBOrgCode());// TODO 税务总局系统登陆人手机号
        data.put("invoiceTotalPrice", vo.getTotalPrice().subtract(vo.getTotalTax()));
        data.put("invoiceTotalPriceTax", vo.getTotalPrice());
        data.put("invoiceTotalTax", vo.getTotalTax());
        data.put("buyerBankName", vo.getPartyAOpenBank());
        data.put("buyerBankNumber", vo.getPartyABankAccount());

        jsonObject.put("data", data);
        return jsonObject;
    }

    @Override
    public void refuseApproval(Long id) {
        ContractInvoice invoice = baseMapper.selectById(id);
@@ -1190,7 +1406,7 @@
                JSONObject resultObj = JSONObject.parseObject(result);
                if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
                        !resultObj.getBoolean("success")) {
                    log.error("红字确认单成功！！！");
                    log.error("红字确认单失败！！！");

                    return R.failed(resultObj.getString("message"));
                }

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java

@@ -246,7 +246,8 @@
                        //当前为合同最后阶段
                        PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                                .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                        if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
                        if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                                &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                            //有预付且超过应收 关闭合同状态
                            contract.setContractStatus(3);
                            contractMapper.updateById(contract);
@@ -358,7 +359,8 @@
                //当前为合同最后阶段
                PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                        .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
                if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                        &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                    //有预付且超过应收 关闭合同状态
                    contract.setContractStatus(3);
                    contractMapper.updateById(contract);

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java

@@ -425,6 +425,10 @@
        if (CollUtil.isNotEmpty(slipList)){
            detailVo.setPaymentSlip(slipList);
        }
        BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
        if (ObjUtil.isNotNull(customer)){
            detailVo.setInvoiceType(customer.getInvoiceType());
        }
        return detailVo;
    }

@@ -720,15 +724,58 @@
                    }

                }
                if (StrUtil.equals(contract.getPartyBId()+"",smj)&&StrUtil.isNotEmpty(smjErp)){
                if ((StrUtil.equals(contract.getPartyBId()+"",smj)||StrUtil.equals(contract.getPartyBId()+"",smjsc)||
                        StrUtil.equals(contract.getPartyBId()+"",smjzt))&&StrUtil.isNotEmpty(smjErp)){
                    request.put("customerCode",customer.getErpCompanyCode());
                    request.put("currencyId","RMB");
                    request.put("signDate",DateUtil.format(contract.getSignDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("dateDeliver",DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                    request.put("moneySum",contract.getAmount());
                    request.put("signManner","面签");
                    request.put("salesman","");
                    if (ArrayUtil.isNotEmpty(subjectMatterList)){
                        JSONArray subjectMatter = new JSONArray();
                        subjectMatterList.stream().forEach(contractSubjectMatter -> {
                            JSONObject subjectMatterItem = new JSONObject();
                            subjectMatterItem.put("itemNo",contractSubjectMatter.getMaterialCode());
                            subjectMatterItem.put("salePrice",contractSubjectMatter.getUnitPrice());
                            subjectMatterItem.put("qtyRequired",contractSubjectMatter.getQuantity());
                            subjectMatterItem.put("money",contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
                            Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId,contract.getCompId())
                                    .eq(Product::getErpCode,contractSubjectMatter.getMaterialCode()));
                            if (ObjUtil.isNotNull(product)){
                                subjectMatterItem.put("taxRate",new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
                            }
                            subjectMatterItem.put("dateDeliver",ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate())?
                                    DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(),DatePattern.NORM_DATETIME_PATTERN):
                                    DateUtil.format(contract.getExpirationDate(),DatePattern.NORM_DATETIME_PATTERN));
                            subjectMatter.add(subjectMatterItem);
                        });
                        request.put("details",subjectMatter);
                    }

                    JSONObject loginJson = new JSONObject();
                    loginJson.put("username","admin");
                    loginJson.put("password","Zimafold@2026");
                    log.info("石煤机合同推送获取token入参：{}",loginJson.toJSONString());
                    String loginResp = HttpUtil.post(smjErp+"/api/account/v1/login",loginJson.toJSONString());
                    log.info("石煤机合同推送获取token回参：{}",loginResp);
                    JSONObject respJson = JSONObject.parseObject(loginResp);
                    if (respJson.getInteger("code")==0){
                        JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
                    log.info("石煤机合同推送erp入参：{}",request.toJSONString());
                    String result = HttpUtil.post(smjErp,request.toJSONString());
                    log.info("石煤机合同推送erp回参：{}",result);
                        HttpResponse response = HttpRequest.post(smjErp+"/api/contract/v1/createWithDetails")
                                .header("token", dataJson.getString("token"))       // 添加认证头
                                .header("Content-Type", "application/json")         // 设置内容类型
                                .body(request.toJSONString())                        // 设置请求体
                                .execute();                                         // 执行请求.post(ymjErp,request.toJSONString());
                        log.info("石煤机合同推送erp回参：{}",response.body());
                    //保存请求记录
                    saveErpRequestRecord("smj",request.toJSONString(),result);
                        saveErpRequestRecord("smj",request.toJSONString(),response.body());
                    //更新合同erp推送标识
                    contract.setErpPushFlag("1");
                    baseMapper.updateById(contract);
                    }
                }

                if (StrUtil.equals(contract.getPartyBId()+"",jxc)&&StrUtil.isNotEmpty(jxcErp)){
@@ -1188,6 +1235,8 @@
                }
                contractExecDate.setGenFlag("1");
                contractExecDateMapper.updateById(contractExecDate);
                contract.setBillingStatus("2");
                baseMapper.updateById(contract);
            });
        }
        return R.ok();
@@ -2270,4 +2319,66 @@
        baseMapper.insert(contract);
        return R.ok();
    }

    @Override
    public R pushCenter(Long id) {
        Contract contract = baseMapper.selectById(id);
        List<ContractSubjectMatter> subjectMatterList=contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
                .eq(ContractSubjectMatter::getContractId,id));
        JSONObject requestApply = new JSONObject();
        requestApply.put("fd_selectionmethod", "公开招标");
        requestApply.put("fd_isrelated", "是");
        requestApply.put("fd_bizId", contract.getId());
        requestApply.put("fd_remark", contract.getRemark());
        requestApply.put("fd_MainContent", "");
        requestApply.put("fd_settlementType", "00");
        requestApply.put("fd_applyType", "外销");
        requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
        requestApply.put("fd_docNumber", contract.getContractNo());
        requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
        requestApply.put("fd_name", contract.getContractName());
        requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
        requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
        requestApply.put("fd_contractCreater", contract.getNickName());
        requestApply.put("fd_currency", "人民币");
        requestApply.put("fd_ContractAmount", contract.getAmount());
        requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
                .multiply(new BigDecimal("87")));
        requestApply.put("fd_docStatus", "20");
        requestApply.put("fd_taxRates", 13);
        requestApply.put("fd_customerName", contract.getPartyA());
        requestApply.put("fd_systemSource", "非煤销售系统");
        requestApply.put("fd_type", "00");
        log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
        String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
        log.info("合同中心合同起草接口回参：{}", respApply);
        JSONObject applyResp = JSONObject.parseObject(respApply);
        if (applyResp.getString("code").equals("00")) {
            JSONObject request = new JSONObject();
            request.put("fd_docNumber", contract.getContractNo());
            request.put("fd_singer", contract.getNickName());
            request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
            request.put("fd_linkPerson", "");
            request.put("fd_linkPhone", "");
            request.put("fd_address", contract.getSignPlace());
            request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
            request.put("fd_receivedNum", 1);
            request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
            request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
            request.put("fd_reviewerNo", contract.getNickName());
            request.put("fd_docStatus", "20");
            request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
            request.put("fd_attName", contract.getAttachmentName());
            request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
            log.info("合同中心同步合同接口入参：{}", request.toJSONString());
            String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
            log.info("合同中心同步合同接口回参：{}", resp);
            JSONObject respJson = JSONObject.parseObject(resp);
            if (respJson.getString("code").equals("00")) {
                contract.setCenterPushFlag("1");
                baseMapper.updateById(contract);
            }
        }
        return R.ok();
    }
}

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/MeterReadRecordServiceImpl.java

@@ -100,6 +100,7 @@
        schedule.setPaymentStatus(0);
        schedule.setActualAmount(new BigDecimal("0"));
        schedule.setInvoiceFlag("0");
        schedule.setInvoiceNum(record.getUsageNum());
        contractPaymentScheduleMapper.insert(schedule);
        //房屋租赁生成应收
        PaymentConfirm confirm = new PaymentConfirm();
@@ -133,6 +134,9 @@
            confirm.setCompId(contract.getCompId());
            paymentConfirmMapper.insert(confirm);
        }
        contract.setBillingStatus("2");
        contract.setAmount(contract.getAmount().add(confirm.getTransationAmount()));
        contractMapper.updateById(contract);
        //判断 循环是否完成
        List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId,contract.getId())
                .eq(ContractExecDate::getGenFlag,"0"));

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java

@@ -405,7 +405,8 @@
                        //当前为合同最后阶段
                        PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                                .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                        if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
                        if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                                &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                            //有预付且超过应收 关闭合同状态
                            contract.setContractStatus(3);
                            contractMapper.updateById(contract);
@@ -736,7 +737,8 @@
                //当前为合同最后阶段
                PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
                        .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
                if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
                if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
                        &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                    //有预付且超过应收 关闭合同状态
                    contract.setContractStatus(3);
                    contractMapper.updateById(contract);

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java

@@ -209,7 +209,7 @@
                }
                paid = paid.add(addDTO.getTransationAmount());
                contract.setPaidAmount(paid);
                if (paid.compareTo(contract.getAmount()) == 0) {
                if (paid.compareTo(contract.getAmount()) == 0&&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
                    contract.setContractStatus(3);
                    contract.setPaidAmount(contract.getAmount());
                }

 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentOffsetServiceImpl.java

@@ -137,7 +137,7 @@
        }
        paid = paid.add(paymentOffset.getOffsetAmount());
        contract.setPaidAmount(paid);
        if (paid.compareTo(contract.getAmount())==0){
        if (paid.compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
//            contract.setBillingStatus("2");
            contract.setContractStatus(3);
        }

 platformx-business-finance-biz/src/main/resources/mapper/ContractMapper.xml

@@ -1094,6 +1094,7 @@
               c.next_schedule_name,
            c.warranty_schedule_id,
            c.comp_id,
            c.center_push_flag,
            (select sum(delivered_quantity*unit_price) from contract_subject_matter csm where csm.contract_id = c.id) outAmount
            FROM
        contract c,