2025/platformx-business-finance.git

			@@ -5,7 +5,9 @@
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.date.DatePattern;
			import cn.hutool.core.date.DateUtil;
			import cn.hutool.core.util.ArrayUtil;
			import cn.hutool.core.lang.tree.Tree;
			import cn.hutool.core.lang.tree.TreeNode;
			import cn.hutool.core.lang.tree.TreeUtil;
			import cn.hutool.core.util.IdUtil;
			import cn.hutool.core.util.ObjUtil;
			import cn.hutool.core.util.StrUtil;
			@@ -20,10 +22,7 @@
			import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
			import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
			import com.by4cloud.platformx.business.constant.FlowNameEnum;
			import com.by4cloud.platformx.business.dto.ContractInvoiceQueryDTO;
			import com.by4cloud.platformx.business.dto.ContractQueryDTO;
			import com.by4cloud.platformx.business.dto.GenInvoiceInfoDTO;
			import com.by4cloud.platformx.business.dto.InvoiceQueryDTO;
			import com.by4cloud.platformx.business.dto.*;
			import com.by4cloud.platformx.business.entity.*;
			import com.by4cloud.platformx.business.mapper.*;
			import com.by4cloud.platformx.business.service.ContractInvoiceService;
			@@ -36,6 +35,7 @@
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.data.redis.core.StringRedisTemplate;
			import org.springframework.stereotype.Service;
			@@ -68,6 +68,8 @@
			private final RemoteFlowProcessService remoteFlowProcessService;
			private final PaymentConfirmService paymentConfirmService;
			private final StringRedisTemplate redisTemplate;
			private final BipViewMapper bipViewMapper;
			private final BipDictMapper bipDictMapper;


			@Value("${BWInvoice.url}")
			@@ -79,11 +81,29 @@
			@Value("${bip.url}")
			private String url;

			@Value("${bip.appKey}")
			private String appKey;
			@Value("${dept.sgb}")
			private String sgb;

			@Value("${bip.appSecret}")
			private String appSecret;
			@Value("${dept.smj}")
			private String smj;

			@Value("${dept.smjzt}")
			private String smjzt;

			@Value("${dept.smjsc}")
			private String smjsc;

			@Value("${dept.smjhw}")
			private String smjhw;

			@Value("${dept.tfgs}")
			private String tfgs;

			@Value("${dept.jxc}")
			private String jxc;

			@Value("${dept.ymj}")
			private String ymj;

			@Value("${file.path}")
			private String localPath;
			@@ -112,7 +132,38 @@
			contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
			});
			}
			return R.ok(invoiceOutBoundVoList);
			return R.ok(invoiceOutBoundVoList.stream().filter(item -> item.getUnitPrice().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));
			}

			@Override
			public R getMergeContractOutBound(Long[] ids) {
			if (CollUtil.isEmpty(Arrays.asList(ids))) {
			return R.failed("请选择合并开票的合同");
			}
			MPJLambdaWrapper<ContractOutBound> wrapper = new MPJLambdaWrapper<ContractOutBound>()
			.selectAll(ContractOutBound.class)
			.in(ContractOutBound::getContractId, ids);
			List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractOutBoundMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
			if (CollUtil.isNotEmpty(invoiceOutBoundVoList)) {
			invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {

			contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getInvoiceNum()));
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.in(ContractSubjectMatter::getContractId, ids)
			.eq(ContractSubjectMatter::getMaterialCode, contractInvoiceOutBoundVo.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractInvoiceOutBoundVo.getLineNo()), ContractSubjectMatter::getLineNo, contractInvoiceOutBoundVo.getLineNo())
			.last("limit 1"));
			if (ObjUtil.isNotNull(subjectMatter)) {
			contractInvoiceOutBoundVo.setUnitPrice(subjectMatter.getUnitPrice());
			if (subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0")) > 0) {
			contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(subjectMatter.getAdvanceNum()));
			}
			}
			contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
			});
			}
			return R.ok(invoiceOutBoundVoList.stream().filter(item -> item.getUnitPrice().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));

			}

			@Override
			@@ -124,13 +175,13 @@
			.selectAs(ContractSubjectMatter::getQuantity, "outBoundNum")
			.eq(ContractSubjectMatter::getContractId, contractId);
			List<ContractInvoiceOutBoundVo> invoiceOutBoundVoList = contractSubjectMatterMapper.selectJoinList(ContractInvoiceOutBoundVo.class, wrapper);
			if (ArrayUtil.isNotEmpty(invoiceOutBoundVoList)) {
			if (CollUtil.isNotEmpty(invoiceOutBoundVoList)) {
			invoiceOutBoundVoList.stream().forEach(contractInvoiceOutBoundVo -> {
			contractInvoiceOutBoundVo.setInvoiceNum(contractInvoiceOutBoundVo.getOutBoundNum().subtract(contractInvoiceOutBoundVo.getAdvanceNum()));
			contractInvoiceOutBoundVo.setToInvoiceNum(contractInvoiceOutBoundVo.getInvoiceNum());
			});
			}
			return R.ok(invoiceOutBoundVoList);
			return R.ok(invoiceOutBoundVoList.stream().filter(item -> item.getUnitPrice().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));
			}

			@Override
			@@ -148,8 +199,8 @@
			if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
			return R.failed("请选择开票出库单后再操作");
			}
			genInvoiceInfoDTO.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList().stream().filter(item->
			item.getInvoiceNum().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
			genInvoiceInfoDTO.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList().stream().filter(item ->
			item.getInvoiceNum().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));
			if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
			return R.failed("请选择开票出库单后或调整开票数量再操作");
			}
			@@ -171,11 +222,35 @@
			return R.failed("获取开票单位异常");
			}
			SysDept b = r.getData();
			BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
			if (ObjUtil.isNull(customer)) {
			return R.failed("获取购方单位异常");
			}
			BigDecimal advanceAmount = new BigDecimal("0");
			for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(subjectMatter)) {
			advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
			}
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			} else {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			}
			}
			log.info("advanceAmount:{}", advanceAmount);
			@@ -184,7 +259,7 @@
			return R.failed("开票金额超出合同签订阶段应收金额:" + schedule.getPlannedAmount() + ",请调整开票数量");
			}
			GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);

			vo = transBipVo(vo, b, customer);
			return R.ok(vo);
			}

			@@ -205,8 +280,36 @@
			return R.failed("获取开票单位异常");
			}
			SysDept b = r.getData();
			BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
			if (ObjUtil.isNull(customer)) {
			return R.failed("获取购方单位异常");
			}
			for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt)\|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			} else {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			}

			}
			//机动车开票
			if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "3") \|\| StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
			if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
			if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
			return R.failed("机动车开票请输入车架号");
			}
			@@ -220,19 +323,187 @@
			return r1;
			}
			JSONObject request1 = genQueryVehDetailParam(genInvoiceInfoDTO.getVehicleNo(), b);
			R r2 = requestQueryVehicleDetail(request1);
			R<JSONObject> r2 = requestQueryVehicleDetail(request1, genInvoiceInfoDTO);
			if (!r2.isOk()) {
			return r2;
			}
			r2.getData().put("contact", b.getOrgContact());
			genInvoiceInfoDTO.setVehicleData(r2.getData().toString());
			}

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

			vo = transBipVo(vo, b, customer);
			return R.ok(vo);
			}

			private R requestQueryVehicleDetail(JSONObject request) {
			@Override
			public R genMergeInvoiceInfo(GenMergeInvoiceDTO mergeInvoiceDTO) {
			R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
			if (!r.isOk()) {
			return R.failed("获取开票单位异常");
			}
			SysDept b = r.getData();
			BusinessCustomer customer = businessCustomerMapper.selectById(mergeInvoiceDTO.getBusGuestId());
			if (ObjUtil.isNull(customer)) {
			return R.failed("获取购方单位异常");
			}
			for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : mergeInvoiceDTO.getOutBoundInvoiceList()) {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			} else {
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			if (ObjUtil.isNull(product) \|\| StrUtil.isBlank(product.getTaxClass()) \|\| StrUtil.isBlank(product.getTaxCode())) {
			return R.failed("请在产品信息中补充税收分类信息");
			}
			}

			}
			GenInvoiceInfoVo vo = genMergeInvoiceVo(mergeInvoiceDTO, customer, b);
			vo = transBipVo(vo, b, customer);
			return R.ok(vo);
			}

			private GenInvoiceInfoVo genMergeInvoiceVo(GenMergeInvoiceDTO mergeInvoiceDTO, BusinessCustomer customer, SysDept b) {
			GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
			vo.setPartyA(customer.getCompanyName());
			vo.setPartyAOrgCode(customer.getCreditCode());
			vo.setPartyAOpenBank(customer.getBankName());
			vo.setPartyABankAccount(customer.getBankAccount());
			vo.setPartyB(b.getOrgName());
			vo.setPartyBOrgCode(b.getOrgCode());
			vo.setPartyBOpenBank(b.getOrgBank());
			vo.setPartyBBankAccount(b.getOrgBankAccount());
			vo.setInvoiceType(customer.getInvoiceType());
			vo.setRemarks(mergeInvoiceDTO.getRemarks());
			vo.setOutBoundInvoiceList(mergeInvoiceDTO.getOutBoundInvoiceList());
			vo.setContractIds(mergeInvoiceDTO.getContractIds());
			if (StrUtil.isNotBlank(mergeInvoiceDTO.getInvoiceType())) {
			vo.setInvoiceVehicleType(mergeInvoiceDTO.getInvoiceType());
			}

			List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
			List<String> erpCode = new ArrayList<>();
			List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();

			if (CollUtil.isNotEmpty(mergeInvoiceDTO.getOutBoundInvoiceList())) {
			mergeInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()), ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
			.eq(ContractSubjectMatter::getContractId, contractOutBound.getContractId()).last("limit 1"));
			if (!CollUtil.contains(erpCode, contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice())) {
			erpCode.add(contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice());
			ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
			mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice());
			mergeVo.setMaterialInternalName(contractOutBound.getSubjectMatterName());
			mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
			Product product = new Product();
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			} else {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			}

			if (ObjUtil.isNotNull(product)) {
			mergeVo.setTaxClass(product.getTaxClass());
			mergeVo.setSpecification(product.getProductType());
			mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
			mergeVo.setTaxCode(product.getTaxCode());
			}
			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 {
			List<ContractOutBoundMergeVo> filteredList = mergeOutBounds.stream()
			.filter(item -> item.getMaterialCode().equals(subjectMatter.getMaterialCode() + subjectMatter.getUnitPrice())) // 防止空指针，建议常量在前
			.collect(Collectors.toList());
			if (CollUtil.isNotEmpty(filteredList)) {
			filteredList.get(0).setQuantity(filteredList.get(0).getQuantity().add(contractOutBound.getOutBoundNum()));
			}
			}
			});
			if (CollUtil.isNotEmpty(mergeOutBounds)) {
			invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
			invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0)
			.forEach(invoiceItemVo -> {
			// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
			BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
			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.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()));
			}
			}

			return vo;
			}

			private GenInvoiceInfoVo transBipVo(GenInvoiceInfoVo vo, SysDept comp, BusinessCustomer customer) {
			ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
			bipVo.setDjrq(DateUtil.today());
			bipVo.setKpzz(comp.getBipCode());
			bipVo.setYwzz(comp.getBipCode());
			R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
			if (rDept.isOk()) {
			bipVo.setBm(rDept.getData().getOrgCode());
			bipVo.setHsdy(rDept.getData().getOrgCode());
			}
			bipVo.setYwy(SecurityUtils.getUser().getNickname());
			bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
			bipVo.setJylx("ZBYXGLXT");
			bipVo.setWldxlx("1");
			bipVo.setKh(customer.getCreditCode());
			bipVo.setBz("CNY");
			bipVo.setFjzs("1");
			bipVo.setSfzy("1");
			bipVo.setSfnbwl("1");
			bipVo.setSfjyjs("0");
			bipVo.setDjfx("1");
			bipVo.setItemList(vo.getInvoiceItemList());
			vo.setBipVo(bipVo);
			return vo;
			}

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

			log.info("机动车合格证查询接口入参：{},", request.toJSONString());
			@@ -247,6 +518,17 @@
			JSONArray models = resultObj.getJSONArray("model");
			if (CollUtil.isNotEmpty(models)) {
			JSONObject model = (JSONObject) models.get(0);
			if (StrUtil.isNotBlank(invoiceInfoDTO.getOrigin())) {
			model.put("origin", invoiceInfoDTO.getOrigin());
			}
			if (StrUtil.isNotBlank(invoiceInfoDTO.getTonnage())) {
			model.put("tonnage", invoiceInfoDTO.getTonnage());
			}
			if (StrUtil.isNotBlank(invoiceInfoDTO.getPassengersLimited())) {
			model.put("passengersLimited", invoiceInfoDTO.getPassengersLimited());
			}
			model.put("origin", invoiceInfoDTO.getOrigin());
			model.put("vehicleNo", invoiceInfoDTO.getVehicleNo());
			return R.ok(model);
			}
			return R.failed("机动车合格证查询异常");
			@@ -295,8 +577,9 @@
			private GenInvoiceInfoVo genInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
			GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
			BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
			vo.setPartyA(a.getCompanyName());
			vo.setPartyAOrgCode(a.getCreditCode());
			vo.setContractId(contract.getId());
			vo.setPartyA(genInvoiceInfoDTO.getPartyA());
			vo.setPartyAOrgCode(genInvoiceInfoDTO.getPartyAOrgCode());
			vo.setPartyAOpenBank(a.getBankName());
			vo.setPartyABankAccount(a.getBankAccount());
			vo.setPartyB(b.getOrgName());
			@@ -304,6 +587,8 @@
			vo.setPartyBOpenBank(b.getOrgBank());
			vo.setPartyBBankAccount(b.getOrgBankAccount());
			vo.setInvoiceType(a.getInvoiceType());
			vo.setRemarks(genInvoiceInfoDTO.getRemarks());
			vo.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList());
			if (StrUtil.isNotBlank(genInvoiceInfoDTO.getInvoiceType())) {
			vo.setInvoiceVehicleType(genInvoiceInfoDTO.getInvoiceType());
			}
			@@ -319,6 +604,73 @@
			List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
			List<String> erpCode = new ArrayList<>();
			List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
			if (genInvoiceInfoDTO.getInvoiceType().equals("3")) {
			String[] vehiclenNoList = genInvoiceInfoDTO.getVehicleNo().split(",");
			for (int i = 0; i < vehiclenNoList.length; i++) {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
			ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()), ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
			.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
			ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
			mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice());
			mergeVo.setMaterialInternalName(contractOutBound.getSubjectMatterName());
			mergeVo.setQuantity(new BigDecimal("1"));
			Product product = new Product();
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt)\|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			} else {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			}

			if (ObjUtil.isNotNull(product)) {
			mergeVo.setTaxClass(product.getTaxClass());
			mergeVo.setSpecification(vehiclenNoList[i]);
			mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
			mergeVo.setTaxCode(product.getTaxCode());
			}
			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);
			}
			if (CollUtil.isNotEmpty(mergeOutBounds)) {
			invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
			invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0)
			.forEach(invoiceItemVo -> {
			// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
			BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
			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.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()));
			}
			return vo;
			}
			// List<ContractOutBound> outBounds = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
			// .in(ContractOutBound::getId, genInvoiceInfoDTO.getOutBoundInvoiceList().stream().map(item->item.getContractOutBoundId()).collect(Collectors.toList())));
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			@@ -327,16 +679,30 @@
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()),ContractSubjectMatter::getLineNo,contractOutBound.getLineNo())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()), ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
			.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
			if (!CollUtil.contains(erpCode, contractOutBound.getSubjectMatterCode()+subjectMatter.getUnitPrice())) {
			erpCode.add(contractOutBound.getSubjectMatterCode()+subjectMatter.getUnitPrice());
			if (!CollUtil.contains(erpCode, contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice())) {
			erpCode.add(contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice());
			ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
			mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode()+subjectMatter.getUnitPrice());
			mergeVo.setMaterialCode(contractOutBound.getSubjectMatterCode() + subjectMatter.getUnitPrice());
			mergeVo.setMaterialInternalName(contractOutBound.getSubjectMatterName());
			mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
			Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			Product product = new Product();
			List<String> smjList = new ArrayList<>();
			smjList.add(smj);
			smjList.add(smjsc);
			smjList.add(smjzt);
			smjList.add(smjhw);
			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) \|\| ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) \|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjzt)\|\|
			("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.in(Product::getCompId, smjList).last("limit 1"));
			} else {
			product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
			.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
			}

			if (ObjUtil.isNotNull(product)) {
			mergeVo.setTaxClass(product.getTaxClass());
			mergeVo.setSpecification(product.getProductType());
			@@ -359,23 +725,24 @@
			mergeOutBounds.add(mergeVo);
			} else {
			List<ContractOutBoundMergeVo> filteredList = mergeOutBounds.stream()
			.filter(item -> item.getMaterialCode().equals(subjectMatter.getMaterialCode()+subjectMatter.getUnitPrice())) // 防止空指针，建议常量在前
			.filter(item -> item.getMaterialCode().equals(subjectMatter.getMaterialCode() + subjectMatter.getUnitPrice())) // 防止空指针，建议常量在前
			.collect(Collectors.toList());
			if (ArrayUtil.isNotEmpty(filteredList)) {
			if (CollUtil.isNotEmpty(filteredList)) {
			filteredList.get(0).setQuantity(filteredList.get(0).getQuantity().add(contractOutBound.getOutBoundNum()));
			}
			}
			});
			if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
			if (CollUtil.isNotEmpty(mergeOutBounds)) {
			invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
			invoiceItemVoList.stream().forEach(invoiceItemVo -> {
			invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0)
			.forEach(invoiceItemVo -> {
			// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
			BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
			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);
			});
			BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
			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.getPriceAndTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
			vo.setTotalTax(invoiceItemVoList.stream().map(item -> item.getPriceTax()).reduce(BigDecimal.ZERO, BigDecimal::add));
			vo.setInvoiceItemList(invoiceItemVoList);
			@@ -383,7 +750,7 @@
			}
			}
			} else {
			if (ArrayUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
			if (CollUtil.isNotEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
			genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());

			@@ -424,21 +791,22 @@
			} else {
			List<ContractOutBoundMergeVo> filterMergeVo = mergeOutBounds.stream().filter(item -> item.getMaterialCode()
			.equals(schedule.getSubjectMatterCode())).collect(Collectors.toList());
			if (ArrayUtil.isNotEmpty(filterMergeVo)) {
			if (CollUtil.isNotEmpty(filterMergeVo)) {
			filterMergeVo.get(0).setPriceAndTax(schedule.getPlannedAmount().add(filterMergeVo.get(0).getPriceAndTax()));
			}
			}
			});
			if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
			if (CollUtil.isNotEmpty(mergeOutBounds)) {
			invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
			invoiceItemVoList.stream().forEach(invoiceItemVo -> {
			invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0)
			.forEach(invoiceItemVo -> {
			// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
			BigDecimal itemPrice = invoiceItemVo.getPriceAndTax();
			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));
			BigDecimal itemPrice = invoiceItemVo.getPriceAndTax();
			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);
			@@ -452,15 +820,18 @@
			private GenInvoiceInfoVo genAdvanceInvoiceInfoVo(GenInvoiceInfoDTO genInvoiceInfoDTO, Contract contract, SysDept b) {
			GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
			BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
			vo.setContractId(contract.getId());
			vo.setAdvanceInvoice("111");
			vo.setPartyA(a.getCompanyName());
			vo.setPartyAOrgCode(a.getCreditCode());
			vo.setPartyA(genInvoiceInfoDTO.getPartyA());
			vo.setPartyAOrgCode(genInvoiceInfoDTO.getPartyAOrgCode());
			vo.setPartyAOpenBank(a.getBankName());
			vo.setPartyABankAccount(a.getBankAccount());
			vo.setPartyB(b.getOrgName());
			vo.setPartyBOrgCode(b.getOrgCode());
			vo.setPartyBOpenBank(b.getOrgBank());
			vo.setPartyBBankAccount(b.getOrgBankAccount());
			vo.setRemarks(genInvoiceInfoDTO.getRemarks());
			vo.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList());
			List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
			List<String> erpCode = new ArrayList<>();
			List<ContractOutBoundMergeVo> mergeOutBounds = new ArrayList<>();
			@@ -469,7 +840,7 @@
			genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(subjectMatter)) {
			if (!CollUtil.contains(erpCode, subjectMatter.getMaterialCode()+subjectMatter.getUnitPrice())) {
			if (!CollUtil.contains(erpCode, subjectMatter.getMaterialCode() + subjectMatter.getUnitPrice())) {
			erpCode.add(subjectMatter.getMaterialCode());
			ContractOutBoundMergeVo mergeVo = new ContractOutBoundMergeVo();
			mergeVo.setMaterialCode(subjectMatter.getMaterialCode());
			@@ -504,9 +875,9 @@

			}
			});
			if (ArrayUtil.isNotEmpty(mergeOutBounds)) {
			if (CollUtil.isNotEmpty(mergeOutBounds)) {
			invoiceItemVoList = BeanUtil.copyToList(mergeOutBounds, InvoiceItemVo.class);
			invoiceItemVoList.stream().forEach(invoiceItemVo -> {
			invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0).forEach(invoiceItemVo -> {
			// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
			BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
			BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
			@@ -525,36 +896,18 @@
			}

			@Override
			public R toInvoice(GenInvoiceInfoDTO genInvoiceInfoDTO) {
			if (CollUtil.isEmpty(genInvoiceInfoDTO.getOutBoundInvoiceList())) {
			return R.failed("请选择开票出库单后再操作");
			public R toInvoice(ToInvoiceDTO toInvoiceDTO) {
			Contract contract = contractMapper.selectById(toInvoiceDTO.getContractId());
			if (ObjUtil.isNull(contract)) {
			return R.failed("合同信息异常，请联系技术人员");
			}
			genInvoiceInfoDTO.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList().stream().filter(item->
			item.getInvoiceNum().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
			if (CollUtil.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())) {
			if (StrUtil.isNotBlank(toInvoiceDTO.getAdvanceInvoice())) {

			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getStageName, "合同签订").eq(ContractPaymentSchedule::getContractId, genInvoiceInfoDTO.getContractId())
			.eq(ContractPaymentSchedule::getStageName, "合同签订").eq(ContractPaymentSchedule::getContractId, toInvoiceDTO.getContractId())
			.last("limit 1"));
			if (ObjUtil.isNull(schedule)) {
			return R.failed("合同预收款阶段异常，请联系技术人员");
			}
			Contract contract = contractMapper.selectById(genInvoiceInfoDTO.getContractId());
			if (ObjUtil.isNull(contract)) {
			return R.failed("合同信息异常，请联系技术人员");
			}
			ContractInvoice lastInvoice = baseMapper.selectOne(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, contract.getId())
			.orderByDesc(ContractInvoice::getCreateTime).last("limit 1"));
			@@ -567,7 +920,7 @@
			}
			SysDept b = r.getData();
			BigDecimal advanceAmount = new BigDecimal("0");
			for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : genInvoiceInfoDTO.getOutBoundInvoiceList()) {
			for (ContractOutBoundInvoiceVo contractOutBoundInvoiceVo : toInvoiceDTO.getOutBoundInvoiceList()) {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(subjectMatter)) {
			advanceAmount = advanceAmount.add(contractOutBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
			@@ -577,9 +930,9 @@
			if (advanceAmount.compareTo(schedule.getPlannedAmount()) > 0) {
			return R.failed("开票金额超出合同签订阶段应收金额:" + schedule.getPlannedAmount() + ",请调整开票数量");
			}
			GenInvoiceInfoVo vo = genAdvanceInvoiceInfoVo(genInvoiceInfoDTO, contract, b);
			GenInvoiceInfoVo vo = BeanUtil.copyProperties(toInvoiceDTO, GenInvoiceInfoVo.class);
			//发票保存
			ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "1");
			ContractInvoice invoice = saveContractInvoice(vo, contract, toInvoiceDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "1", null);
			//启动流程
			ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
			Map<String, Object> map = BeanUtil.beanToMap(invoice);
			@@ -590,57 +943,20 @@
			return R.failed("流程启动失败");
			}
			//更新合同出库单状态
			genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
			contractSubjectMatterMapper.updateById(subjectMatter);
			});
			return R.ok();
			}
			if (!StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
			ContractOutBound outBound = contractOutBoundMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
			contractId = outBound.getContractId();
			} else {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(genInvoiceInfoDTO.getOutBoundInvoiceList().get(0).getContractOutBoundId());
			contractId = schedule.getContractId();
			}
			Contract contract = contractMapper.selectById(contractId);
			if (ObjUtil.isNull(contract)) {
			return R.failed("合同信息异常，请联系技术人员");
			}
			R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
			if (!r.isOk()) {
			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);
			GenInvoiceInfoVo vo = BeanUtil.copyProperties(toInvoiceDTO, GenInvoiceInfoVo.class);
			//发票保存
			ContractInvoice invoice = saveContractInvoice(vo, contract, genInvoiceInfoDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "0");
			ContractInvoice invoice = saveContractInvoice(vo, contract, toInvoiceDTO.getOutBoundInvoiceList(), DateUtil.current() + "", "0", null);
			//启动流程
			ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
			Map<String, Object> map = BeanUtil.beanToMap(invoice);
			if (StrUtil.equals(genInvoiceInfoDTO.getContractCategory(), "water_house")) {
			if (StrUtil.equals(toInvoiceDTO.getContractCategory(), "water_house")) {
			map.put("contractCategory", "water_house");
			}
			dto.setParamMap(map);
			@@ -651,7 +967,7 @@
			}
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//更新合同出库单状态
			genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			contractOutBound.setInvoiceStatus("1");
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
			@@ -659,12 +975,38 @@
			});
			} else {
			//更新合同房租水电费开票状态
			genInvoiceInfoDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			toInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			schedule.setInvoiceFlag("1");
			contractPaymentScheduleMapper.updateById(schedule);
			});
			}
			return R.ok();
			}

			@Override
			public R toMergeInvoice(ToMergeInvoiceDTO toMergeInvoiceDTO) {

			GenInvoiceInfoVo vo = BeanUtil.copyProperties(toMergeInvoiceDTO, GenInvoiceInfoVo.class);
			//发票保存
			ContractInvoice invoice = saveContractInvoice(vo, null, toMergeInvoiceDTO.getOutBoundInvoiceList(),
			DateUtil.current() + "", "0", toMergeInvoiceDTO.getContractIds());
			//启动流程
			ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
			Map<String, Object> map = BeanUtil.beanToMap(invoice);
			dto.setParamMap(map);
			dto.setFlowName(FlowNameEnum.销售挂账审批.name());
			R r1 = remoteFlowProcessService.startProcessInstance(dto);
			if (r1.getCode() == 1) {
			return R.failed("流程启动失败");
			}
			//更新合同出库单状态
			toMergeInvoiceDTO.getOutBoundInvoiceList().stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			contractOutBound.setInvoiceStatus("1");
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
			contractOutBoundMapper.updateById(contractOutBound);
			});
			return R.ok();
			}

			@@ -727,15 +1069,18 @@
			data.put("invoiceTotalPriceTax", vo.getTotalPrice());
			data.put("buyerBankName", vo.getPartyAOpenBank());
			data.put("buyerBankNumber", vo.getPartyABankAccount());

			data.put("remarks", vo.getRemarks());
			jsonObject.put("data", data);
			return jsonObject;
			}

			private ContractInvoice saveContractInvoice(GenInvoiceInfoVo genInvoiceInfoVo, Contract contract,
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo, String advanceFlag) {
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList, String serialNo, String advanceFlag,
			List<String> contractIds) {
			ContractInvoice invoice = new ContractInvoice();
			invoice.setContractId(contract.getId());
			if (ObjUtil.isNotNull(contract)) {
			invoice.setContractId(contract.getId());
			}
			invoice.setInvoiceCategory("1");
			invoice.setRedReversal("0");
			invoice.setSerialNo(serialNo);
			@@ -754,6 +1099,10 @@
			.collect(Collectors.joining(",")));
			invoice.setInvoicePreviewParam(JSONObject.toJSONString(outBoundInvoiceVoList));
			invoice.setAdvanceFlag(advanceFlag);
			if (CollUtil.isNotEmpty(contractIds)) {
			invoice.setIsMerge(true);
			invoice.setContractIds(contractIds.toString());
			}
			baseMapper.insert(invoice);
			return invoice;
			}
			@@ -762,19 +1111,25 @@
			public R getContractInvoiceList(Long contractId) {
			List<ContractInvoice> invoiceList = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
			.eq(ContractInvoice::getContractId, contractId)
			.or()
			.like(ContractInvoice::getContractIds, contractId)
			.orderByDesc(ContractInvoice::getCreateTime));
			return R.ok(invoiceList);
			}

			@Override
			public R toRedInvoice(Long invoiceId) {

			ContractInvoice blueInvoice = baseMapper.selectById(invoiceId);
			blueInvoice.setRedReversal("2");
			baseMapper.updateById(blueInvoice);
			Contract contract = contractMapper.selectById(blueInvoice.getContractId());
			ContractInvoice invoice = new ContractInvoice();
			invoice.setContractId(blueInvoice.getContractId());
			if (!blueInvoice.getIsMerge()) {
			invoice.setContractId(blueInvoice.getContractId());
			}
			if (blueInvoice.getIsMerge()) {
			invoice.setContractIds(blueInvoice.getContractIds());
			invoice.setIsMerge(true);
			}
			invoice.setTaxNo(blueInvoice.getTaxNo());
			invoice.setSellerTaxName(blueInvoice.getSellerTaxName());
			invoice.setBuyerTaxName(blueInvoice.getBuyerTaxName());
			@@ -782,10 +1137,21 @@
			invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
			invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
			invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());
			invoice.setInvoicePreview(blueInvoice.getInvoicePreview());
			invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax());
			invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice());
			invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax());

			ToInvoiceDTO toInvoiceDTO = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()), ToInvoiceDTO.class);
			toInvoiceDTO.setTotalPrice(toInvoiceDTO.getTotalPrice().multiply(new BigDecimal(-1)));
			toInvoiceDTO.setTotalTax(toInvoiceDTO.getTotalTax().multiply(new BigDecimal(-1)));
			if (CollUtil.isNotEmpty(toInvoiceDTO.getInvoiceItemList())) {
			toInvoiceDTO.getInvoiceItemList().stream().forEach(item -> {
			item.setPriceTax(item.getPriceTax().multiply(new BigDecimal("-1")));
			item.setPriceNoTax(item.getPriceNoTax().multiply(new BigDecimal("-1")));
			item.setPriceAndTax(item.getPriceAndTax().multiply(new BigDecimal("-1")));
			});
			}
			invoice.setInvoicePreview(JSONObject.toJSONString(toInvoiceDTO));
			invoice.setInvoiceTotalTax(blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
			invoice.setInvoiceTotalPrice(blueInvoice.getInvoiceTotalPrice().multiply(new BigDecimal("-1")));
			invoice.setInvoiceTotalPriceTax(blueInvoice.getInvoiceTotalPriceTax().multiply(new BigDecimal("-1")));
			invoice.setOutBoundId(blueInvoice.getOutBoundId());
			invoice.setInvoiceTime(new Date());
			invoice.setInvoiceCategory("2");
			@@ -801,8 +1167,11 @@
			ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
			Map<String, Object> map = BeanUtil.beanToMap(invoice);
			dto.setParamMap(map);
			if (StrUtil.equals(contract.getContractCategory(), "water_house")) {
			map.put("contractCategory", "water_house");
			if (!blueInvoice.getIsMerge()) {
			Contract contract = contractMapper.selectById(blueInvoice.getContractId());
			if (StrUtil.equals(contract.getContractCategory(), "water_house")) {
			map.put("contractCategory", "water_house");
			}
			}
			dto.setParamMap(map);
			dto.setFlowName(FlowNameEnum.销售挂账审批.name());
			@@ -814,26 +1183,26 @@
			return R.ok();
			}

			private JSONObject genRedInvoice(Contract contract, ContractInvoice blueInvoice, String redConfirmSerialNo) {
			private JSONObject genRedInvoice(ContractInvoice blueInvoice, ContractInvoice redInvoice, String redConfirmSerialNo) {
			JSONObject jsonObject = new JSONObject();
			jsonObject.put("taxNo", blueInvoice.getTaxNo());
			jsonObject.put("taxNo", redInvoice.getTaxNo());
			jsonObject.put("redConfirmSerialNo", redConfirmSerialNo);
			jsonObject.put("entryIdentity", "01");
			jsonObject.put("sellerTaxNo", blueInvoice.getTaxNo());
			jsonObject.put("sellerTaxName", blueInvoice.getSellerTaxName());
			jsonObject.put("buyerTaxName", blueInvoice.getBuyerTaxName());
			jsonObject.put("buyerTaxNo", blueInvoice.getBuyerTaxNo());
			jsonObject.put("sellerTaxNo", redInvoice.getTaxNo());
			jsonObject.put("sellerTaxName", redInvoice.getSellerTaxName());
			jsonObject.put("buyerTaxName", redInvoice.getBuyerTaxName());
			jsonObject.put("buyerTaxNo", redInvoice.getBuyerTaxNo());
			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")));
			jsonObject.put("invoiceTotalTax", blueInvoice.getInvoiceTotalTax().multiply(new BigDecimal("-1")));
			jsonObject.put("originInvoiceTotalPrice", redInvoice.getInvoiceTotalPriceTax());
			jsonObject.put("originInvoiceTotalTax", redInvoice.getInvoiceTotalTax());
			jsonObject.put("invoiceTotalPrice", redInvoice.getInvoiceTotalPrice());
			jsonObject.put("invoiceTotalTax", redInvoice.getInvoiceTotalTax());
			jsonObject.put("originInvoiceIsPaper", "N");
			jsonObject.put("originInvoiceType", "01");
			jsonObject.put("redInvoiceLabel", "01");
			jsonObject.put("invoiceSource", "2");
			jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
			GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(blueInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
			GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(redInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
			JSONArray invoiceDetailsList = new JSONArray();
			Integer lineNo = 1;
			for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
			@@ -842,12 +1211,15 @@
			invoiceDetail.put("projectName", invoiceItemVo.getItemName());
			invoiceDetail.put("goodsLineNo", lineNo);
			invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
			invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
			invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate());
			invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
			invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
			// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
			invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax().multiply(new BigDecimal("-1")));
			invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax().multiply(new BigDecimal("-1")));
			invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
			invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());
			if (StrUtil.isNotBlank(vo.getInvoiceVehicleType()) && (vo.getInvoiceVehicleType().equals("3") \|\| vo.getInvoiceVehicleType().equals("4"))) {
			invoiceDetail.put("goodsSpecification", invoiceItemVo.getSpecification());
			}
			invoiceDetailsList.add(invoiceDetail);
			lineNo++;
			}
			@@ -863,7 +1235,7 @@
			.eq(ContractInvoice::getApprovalStatus, "1")
			.eq(ContractInvoice::getBwRequestResult, "1")
			.isNull(ContractInvoice::getInvoicePath));
			if (ArrayUtil.isNotEmpty(contractInvoices)) {
			if (CollUtil.isNotEmpty(contractInvoices)) {
			contractInvoices.stream().forEach(contractInvoice -> {
			JSONObject request = new JSONObject();
			request.put("taxNo", contractInvoice.getTaxNo());
			@@ -885,7 +1257,7 @@
			contractInvoice.setInvoiceStatus("2");
			baseMapper.updateById(contractInvoice);
			//传输附件
			pushBipInvoicePdf(contractInvoice);
			// pushBipInvoicePdf(contractInvoice);
			}
			});
			}
			@@ -936,7 +1308,7 @@
			.execute();
			log.info("应收发票附件上传回参:{}", response.body());
			//保存请求记录
			paymentConfirmService.saveBipRequestRecord(request, "应收发票集成接口", response.body());
			paymentConfirmService.saveBipRequestRecord(request, "应收发票附件上传接口", response.body());
			JSONObject resultJson = JSONObject.parseObject(response.body());
			if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
			JSONObject datas = resultJson.getJSONObject("data");
			@@ -970,8 +1342,40 @@
			// 2. 解码 Base64 为字节数组
			byte[] fileBytes = Base64.getDecoder().decode(base64Str);

			File file = new File(targetPath);

			// 1. 获取父目录对象
			File parentDir = file.getParentFile();

			// 2. 如果父目录不为空且不存在，则创建所有必需的父目录
			if (parentDir != null && !parentDir.exists()) {
			// mkdirs() 会递归创建所有不存在的父目录
			// 必须检查返回值，因为可能因权限不足或路径非法而失败
			if (!parentDir.mkdirs()) {
			// 如果 mkdirs 返回 false，再次检查是否存在（处理并发情况）
			if (!parentDir.exists()) {
			log.error("无法创建父目录: " + parentDir.getAbsolutePath());
			}
			}
			}

			// 3. 创建文件本身
			// createNewFile() 仅在文件不存在时创建，如果已存在则返回 false 但不报错
			if (!file.exists()) {
			boolean created = false;
			try {
			created = file.createNewFile();
			} catch (IOException e) {
			e.printStackTrace();
			}
			if (!created) {
			// 处理并发创建失败或其他异常
			log.error("无法创建文件: " + file.getAbsolutePath());
			}
			}

			// 3. 将字节数组写入文件
			try (FileOutputStream fos = new FileOutputStream(new File(targetPath))) {
			try (FileOutputStream fos = new FileOutputStream(file)) {
			fos.write(fileBytes);
			fos.flush();
			System.out.println("文件保存成功: " + targetPath);
			@@ -1083,22 +1487,79 @@
			data.put("bustypeCode", "ZBYXGLXT");//交易类型编码暂估默认ZGYSFP，销售默认ZBYXGLXT
			data.put("contractNo", contract.getContractNo());
			data.put("oriCurrencyCode", "CNY");//币种

			data.put("_status", "Insert");
			GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(contractInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
			JSONArray bodyItem = new JSONArray();
			for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
			for (InvoiceItemVo invoiceItemVo : vo.getBipVo().getItemList()) {
			JSONObject item = new JSONObject();
			item.put("expenseItemCode", invoiceItemVo.getJjsx());//经济事项
			item.put("invoiceNo", contractInvoice.getInvoiceNo());
			item.put("taxRate", invoiceItemVo.getTaxRate());
			item.put("oriTaxAmount", invoiceItemVo.getPriceTax());
			item.put("oriTaxIncludedAmount", invoiceItemVo.getPriceAndTax());
			item.put("remarks", invoiceItemVo.getZy());//摘要
			item.put("_status", "Insert");
			JSONObject freeChId = new JSONObject();
			freeChId.put("GX08", invoiceItemVo.getHsdy());//核算单元
			freeChId.put("YSYF14", "2");//款项类型 1 预收款 2 应收款
			freeChId.put("YSYF31", invoiceItemVo.getSfjs());//是否计税
			freeChId.put("JT04", invoiceItemVo.getHsjylx());//核算交易类型 0101 集团外部 01020301 三级分子公司间 01020302 三级分公司与子子公司之间
			freeChId.put("JT06", invoiceItemVo.getKxmx());//款项明细
			freeChId.put("JT32", invoiceItemVo.getZyys());//作业要素
			freeChId.put("zzbkfl", invoiceItemVo.getBkfl());//板块分类
			freeChId.put("JT12", invoiceItemVo.getCpwlfl());//产品物料分类

			item.put("freeChId", freeChId);
			bodyItem.add(item);
			}
			data.put("bodyItem", bodyItem);
			JSONObject freeChId = new JSONObject();
			freeChId.put("YSYF_SFZY", vo.getBipVo().getSfzy());//是否主营
			freeChId.put("fk_038", vo.getBipVo().getPzzdr());//凭证制单人
			freeChId.put("YSYF_08", vo.getBipVo().getSfnbwl());//是否内部往来
			freeChId.put("YSYF24", vo.getBipVo().getSfjyjs());//是否简易计税
			freeChId.put("fk_002", vo.getBipVo().getFjzs());//附件1
			freeChId.put("GX08", vo.getBipVo().getHsdy());//核算单元
			freeChId.put("TzMY042", contract.getExpirationDate());//预计回款日期
			data.put("freeChId", freeChId);
			data.put("remarks", vo.getBipVo().getZy());//摘要
			jsonObject.put("data", data);
			return jsonObject;
			}

			private String transEconomic(String economicMatters) {
			if (economicMatters.equals("1")) {
			return "09001006";
			}
			if (economicMatters.equals("2")) {
			return "09004003";
			}
			if (economicMatters.equals("3")) {
			return "09003005";
			}
			if (economicMatters.equals("4")) {
			return "09002042";
			}
			if (economicMatters.equals("5")) {
			return "09002002";
			}
			if (economicMatters.equals("6")) {
			return "09004001";
			}
			if (economicMatters.equals("7")) {
			return "09003002001";
			}
			if (economicMatters.equals("8")) {
			return "09003002002";
			}
			if (economicMatters.equals("9")) {
			return "09003002003";
			}
			if (economicMatters.equals("10")) {
			return "09003003";
			}
			return "";
			}

			@Override
			@@ -1106,7 +1567,7 @@
			if (bwFlag) {
			List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
			.eq(ContractInvoice::getInvoiceCategory, "2").eq(ContractInvoice::getInvoiceStatus, "3"));
			if (ArrayUtil.isNotEmpty(contractInvoices)) {
			if (CollUtil.isNotEmpty(contractInvoices)) {
			contractInvoices.stream().forEach(contractInvoice -> {
			JSONObject request = new JSONObject();
			request.put("taxNo", contractInvoice.getTaxNo());
			@@ -1126,7 +1587,7 @@
			return;
			}
			JSONArray models = resultObj.getJSONArray("model");
			if (ArrayUtil.isNotEmpty(models)) {
			if (CollUtil.isNotEmpty(models)) {
			JSONObject model = (JSONObject) models.get(0);

			if (StrUtil.isEmpty(model.getString("confirmBillingMark")) \|\| StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
			@@ -1137,7 +1598,7 @@
			contractInvoice.setInvoiceNo(model.getString("redInvoiceNo"));
			contractInvoice.setRedReversal("1");
			//推送BIP
			pushBipInvoice(contractInvoice);
			// pushBipInvoice(contractInvoice);
			}
			}
			});
			@@ -1155,24 +1616,24 @@
			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 开蓝票接口机动车
			if (StrUtil.equals(vo.getInvoiceVehicleType(), "3")) {
			// TODO 开蓝票接口机动车销售
			if (StrUtil.equals(vo.getInvoiceVehicleType(), "4") && bwFlag) {
			JSONObject request = genBlueInvoiceVehicle(vo, invoice.getSerialNo(), dept);
			String requestId = IdUtil.fastUUID();
			invoice.setBwRequestId(requestId);
			invoice.setBwRequestParam(request.toJSONString());
			log.info("机动车发票开具请求接口入参:{}", 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);
			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) &&
			@@ -1186,13 +1647,39 @@
			invoice.setInvoiceTime(invoiceDate);
			invoice.setInvoiceNo(modelJson.getString("invoiceNo"));
			//推送BIP
			pushBipInvoice(invoice);
			// pushBipInvoice(invoice);
			}
			}

			// TODO 开蓝票接口机动车专用
			if (StrUtil.equals(vo.getInvoiceVehicleType(), "3") && bwFlag) {
			JSONObject request = genBlueInvoiceVehiclePre(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.issue&version=1.0&requestId=" + requestId, request.toJSONString());
			log.info("机动车专用发票开具请求接口回参:{}", result);
			saveBwRequestRecord("baiwang.output.invoice.issue", 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) {
			if (!StrUtil.equals(vo.getInvoiceVehicleType(), "3") && !StrUtil.equals(vo.getInvoiceVehicleType(), "4") && bwFlag) {
			JSONObject request = genBlueInvoice(vo, invoice.getSerialNo(), dept);
			String requestId = IdUtil.fastUUID();
			invoice.setBwRequestId(requestId);
			invoice.setBwRequestParam(request.toJSONString());
			@@ -1215,87 +1702,133 @@
			invoice.setInvoiceTime(invoiceDate);
			invoice.setInvoiceNo(model.getString("invoiceNo"));
			//推送BIP
			pushBipInvoice(invoice);
			// pushBipInvoice(invoice);
			}
			}
			}
			if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
			contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
			contractMapper.updateById(contract);
			return;
			}
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//合同状态
			contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
			contract.setBillingStatus("3");
			//非合并开票
			if (!invoice.getIsMerge()) {
			Contract contract = contractMapper.selectById(invoice.getContractId());
			vo.setContractCategory(contract.getContractCategory());
			if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
			contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
			contractMapper.updateById(contract);
			return;
			}
			if (contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&
			contract.getBillingAmout().compareTo(contract.getAmount()) == 0){
			contract.setContractStatus(3);
			}
			if (contract.getBillingAmout().compareTo(contract.getAmount()) < 0) {
			contract.setBillingStatus("1");
			List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
			.eq(ContractOutBound::getContractId, contract.getId())
			.apply("invoice_num < out_bound_num"));
			if (CollUtil.isNotEmpty(outBoundList)) {
			contract.setBillingStatus("2");
			}

			}
			//防止重复审开票审核通过后开票金额超出合同金额
			if (contract.getBillingAmout().compareTo(contract.getAmount()) > 0) {
			contract.setBillingAmout(contract.getAmount());
			}
			contractMapper.updateById(contract);

			} else {
			//判断循环是否完成
			List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId, contract.getId())
			.eq(ContractExecDate::getGenFlag, "0"));
			if (CollUtil.isEmpty(execDateList)) {
			//判断是否有可开票记录
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag, "0"));
			if (ArrayUtil.isEmpty(scheduleList)) {
			contract.setBillingStatus("3");
			} else {
			contract.setBillingStatus("2");
			}
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//合同状态
			contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
			contract.setBillingStatus("3");
			}
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0 &&
			contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
			contract.setBillingStatus("3");
			if (contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0 &&
			contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
			contract.setContractStatus(3);
			}
			if (contract.getBillingAmout().compareTo(contract.getAmount()) < 0) {
			contract.setBillingStatus("1");
			List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
			.eq(ContractOutBound::getContractId, contract.getId())
			.apply("invoice_num < out_bound_num"));
			if (CollUtil.isNotEmpty(outBoundList)) {
			contract.setBillingStatus("2");
			}

			}
			//防止重复审开票审核通过后开票金额超出合同金额
			if (contract.getBillingAmout().compareTo(contract.getAmount()) > 0) {
			contract.setBillingAmout(contract.getAmount());
			}
			contractMapper.updateById(contract);

			} else {
			//判断是否有可开票记录
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()));
			if (ArrayUtil.isEmpty(scheduleList)) {
			contract.setBillingStatus("1");
			//判断循环是否完成
			List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery().eq(ContractExecDate::getContractId, contract.getId())
			.eq(ContractExecDate::getGenFlag, "0"));
			if (CollUtil.isEmpty(execDateList)) {
			//判断是否有可开票记录
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()).eq(ContractPaymentSchedule::getInvoiceFlag, "0"));
			if (CollUtil.isEmpty(scheduleList)) {
			contract.setBillingStatus("3");
			} else {
			contract.setBillingStatus("2");
			}
			contract.setBillingAmout(vo.getTotalPrice().add(contract.getBillingAmout()));
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
			contract.setBillingStatus("3");
			}
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0 &&
			contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
			contract.setBillingStatus("3");
			contract.setContractStatus(3);
			}
			//防止重复审开票审核通过后开票金额超出合同金额
			if (contract.getBillingAmout().compareTo(contract.getAmount()) > 0) {
			contract.setBillingAmout(contract.getAmount());
			}
			} else {
			contract.setBillingStatus("2");
			//判断是否有可开票记录
			List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
			.eq(ContractPaymentSchedule::getContractId, contract.getId()));
			if (CollUtil.isEmpty(scheduleList)) {
			contract.setBillingStatus("1");
			} else {
			contract.setBillingStatus("2");
			}
			}

			contractMapper.updateById(contract);
			}
			baseMapper.updateById(invoice);
			return;
			} else {
			//合并开票
			List<String> result = Arrays.stream(invoice.getContractIds().replace("[", "").replace("]", "").split(","))
			.map(String::trim)
			.filter(s -> !s.isEmpty())
			.collect(Collectors.toList());
			if (CollUtil.isNotEmpty(result)) {
			for (String cid : result) {
			Contract contract = contractMapper.selectById(cid);
			BigDecimal contractBillAmount = new BigDecimal("0");
			if (CollUtil.isNotEmpty(vo.getOutBoundInvoiceList())) {
			for (ContractOutBoundInvoiceVo outBoundInvoiceVo : vo.getOutBoundInvoiceList()) {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(outBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(contractOutBound) && contractOutBound.getContractId().equals(contract.getId())) {
			ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()), ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
			.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
			if (ObjUtil.isNotNull(subjectMatter) && ObjUtil.isNotNull(subjectMatter.getUnitPrice())) {
			contractBillAmount = contractBillAmount.add(outBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));

			}
			}
			}
			}
			contract.setBillingAmout(contract.getBillingAmout().add(contractBillAmount));
			contract.setBillingStatus("1");
			List<ContractOutBound> outBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
			.eq(ContractOutBound::getContractId, contract.getId())
			.apply("invoice_num < out_bound_num"));
			if (CollUtil.isNotEmpty(outBoundList)) {
			contract.setBillingStatus("2");
			}
			if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
			contract.setBillingStatus("3");
			}
			contractMapper.updateById(contract);
			}
			}

			contractMapper.updateById(contract);
			}
			baseMapper.updateById(invoice);

			}
			//红票
			if (invoice.getInvoiceCategory().equals("2")) {
			// TODO 开红票接口
			ContractInvoice blueInvoice = baseMapper.selectById(invoice.getBlueInvoiceId());
			JSONObject request = genRedInvoice(contract, blueInvoice, invoice.getSerialNo());
			JSONObject request = genRedInvoice(blueInvoice, invoice, invoice.getSerialNo());
			String requestId = IdUtil.fastUUID();
			invoice.setBwRequestId(requestId);
			invoice.setBwRequestParam(request.toJSONString());
			@@ -1323,62 +1856,158 @@
			invoice.setInvoiceNo(model.getString("redInvoiceNo"));
			invoice.setRedReversal("1");
			//推送BIP
			pushBipInvoice(invoice);
			// pushBipInvoice(invoice);
			}
			}
			}
			baseMapper.updateById(invoice);
			contract.setBillingAmout(contract.getBillingAmout().subtract(invoice.getInvoiceTotalPriceTax()));
			//防止重复审开票审核通过后开票金额为负
			if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
			contract.setBillingAmout(new BigDecimal("0"));
			}
			contractMapper.updateById(contract);
			blueInvoice.setRedReversal("1");
			baseMapper.updateById(blueInvoice);
			if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
			//还原预开数量
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(subjectMatter)) {
			subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
			if (subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0")) <= 0) {
			subjectMatter.setAdvanceNum(new BigDecimal("0"));
			}
			contractSubjectMatterMapper.updateById(subjectMatter);
			}
			});
			if (!invoice.getIsMerge()) {
			Contract contract = contractMapper.selectById(invoice.getContractId());
			baseMapper.updateById(invoice);
			contract.setBillingAmout(contract.getBillingAmout().add(invoice.getInvoiceTotalPriceTax()));
			//防止重复审开票审核通过后开票金额为负
			if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
			contract.setBillingAmout(new BigDecimal("0"));
			}
			return;
			}
			//更新合同开票状态前提出库完成
			contract.setBillingStatus("2");
			contractMapper.updateById(contract);
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//更新合同出库单状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
			contractOutBoundMapper.updateById(contractOutBound);
			});
			contractMapper.updateById(contract);
			blueInvoice.setRedReversal("1");
			baseMapper.updateById(blueInvoice);
			if (StrUtil.isNotBlank(vo.getAdvanceInvoice())) {
			//还原预开数量
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(subjectMatter)) {
			subjectMatter.setAdvanceNum(subjectMatter.getAdvanceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
			if (subjectMatter.getAdvanceNum().compareTo(new BigDecimal("0")) <= 0) {
			subjectMatter.setAdvanceNum(new BigDecimal("0"));
			}
			contractSubjectMatterMapper.updateById(subjectMatter);
			}
			});
			}
			return;
			}
			//更新合同开票状态前提出库完成
			contract.setBillingStatus("2");
			contractMapper.updateById(contract);
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//更新合同出库单状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
			contractOutBoundMapper.updateById(contractOutBound);
			});
			}
			} else {
			//更新合同房租水电费开票状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			schedule.setInvoiceFlag("0");
			contractPaymentScheduleMapper.updateById(schedule);
			});
			}
			}
			} else {
			//更新合同房租水电费开票状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(blueInvoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			schedule.setInvoiceFlag("0");
			contractPaymentScheduleMapper.updateById(schedule);
			});
			blueInvoice.setRedReversal("1");
			baseMapper.updateById(blueInvoice);
			//合并开票
			List<String> result = Arrays.stream(invoice.getContractIds().replace("[", "").replace("]", "").split(","))
			.map(String::trim)
			.filter(s -> !s.isEmpty())
			.collect(Collectors.toList());
			if (CollUtil.isNotEmpty(result)) {
			for (String cid : result) {
			Contract contract = contractMapper.selectById(cid);
			if (CollUtil.isNotEmpty(vo.getOutBoundInvoiceList())) {
			for (ContractOutBoundInvoiceVo outBoundInvoiceVo : vo.getOutBoundInvoiceList()) {
			BigDecimal contractBillAmount = new BigDecimal("0");
			if (CollUtil.isNotEmpty(vo.getOutBoundInvoiceList())) {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(outBoundInvoiceVo.getContractOutBoundId());
			if (ObjUtil.isNotNull(contractOutBound) && contractOutBound.getContractId().equals(contract.getId())) {
			ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
			.eq(ContractSubjectMatter::getMaterialCode, contractOutBound.getSubjectMatterCode())
			.eq(StrUtil.isNotBlank(contractOutBound.getLineNo()), ContractSubjectMatter::getLineNo, contractOutBound.getLineNo())
			.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
			if (ObjUtil.isNotNull(subjectMatter) && ObjUtil.isNotNull(subjectMatter.getUnitPrice())) {
			contractBillAmount = contractBillAmount.add(outBoundInvoiceVo.getInvoiceNum().multiply(subjectMatter.getUnitPrice()));
			}
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(outBoundInvoiceVo.getInvoiceNum()));
			contractOutBoundMapper.updateById(contractOutBound);
			}
			}
			//更新合同开票状态前提出库完成
			contract.setBillingStatus("2");
			contract.setBillingAmout(contract.getBillingAmout().add(invoice.getInvoiceTotalPriceTax()));
			//防止重复审开票审核通过后开票金额为负
			if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
			contract.setBillingAmout(new BigDecimal("0"));
			}
			contractMapper.updateById(contract);
			}
			}
			}
			}
			}
			}
			}

			private JSONObject genBlueInvoiceVehiclePre(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
			JSONObject vechicleData = JSONObject.parseObject(vo.getVehicleData());
			JSONObject jsonObject = new JSONObject();
			//销方
			jsonObject.put("taxNo", vo.getPartyBOrgCode());//税号
			jsonObject.put("taxUserName", SecurityUtils.getUser().getPhone());//数电账号

			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", "01");
			data.put("invoiceType", "0");
			data.put("serialNo", serialNo);
			data.put("invoiceSpecialMark", "14");//特定业务标识 14-机动车
			// data.put("taxationMethod","2");
			// data.put("taxationLabel","02");//发票类型代码为“01-数电发票（增值税专用发票）、02-数电发票（普通发票）”时且征税方式为“2-差额征税”时必填
			List<JSONObject> invoiceDetailsList = new ArrayList<>();
			Integer lineNo = 1;
			//data.invoiceDetailsList
			for (InvoiceItemVo invoiceItemVo : vo.getInvoiceItemList()) {
			JSONObject invoiceDetail = new JSONObject();

			invoiceDetail.put("goodsLineNo", lineNo);
			invoiceDetail.put("goodsName", invoiceItemVo.getItemName());
			invoiceDetail.put("projectName", invoiceItemVo.getItemName());
			invoiceDetail.put("goodsCode", invoiceItemVo.getTaxCode());
			invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
			invoiceDetail.put("goodsUnit", "辆");
			invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
			// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
			invoiceDetail.put("goodsSpecification", vo.getVehicleNo());
			invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
			invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax());

			invoiceDetailsList.add(invoiceDetail);
			lineNo++;
			}
			data.put("invoiceDetailsList", invoiceDetailsList);
			//购方
			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;
			}

			private JSONObject genBlueInvoiceVehicle(GenInvoiceInfoVo vo, String serialNo, SysDept dept) {
			@@ -1442,7 +2071,7 @@
			if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
			//更新合同出库单状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
			if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
			@@ -1452,7 +2081,7 @@
			} else {
			//更新合同房租水电费开票状态
			List<ContractOutBoundInvoiceVo> outBoundInvoiceVoList = BeanUtil.copyToList(JSONArray.parseArray(invoice.getInvoicePreviewParam()), ContractOutBoundInvoiceVo.class);
			if (ArrayUtil.isNotEmpty(outBoundInvoiceVoList)) {
			if (CollUtil.isNotEmpty(outBoundInvoiceVoList)) {
			outBoundInvoiceVoList.stream().forEach(contractOutBoundInvoiceVo -> {
			ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
			schedule.setInvoiceFlag("0");
			@@ -1511,7 +2140,7 @@
			invoice.setInvoiceTime(invoiceDate);
			invoice.setInvoiceNo(model.getString("invoiceNo"));
			//推送BIP
			pushBipInvoice(invoice);
			// pushBipInvoice(invoice);
			}
			}
			}
			@@ -1535,7 +2164,7 @@
			}
			invoice.setBwRequestResult("1");
			JSONArray models = resultObj.getJSONArray("model");
			if (ArrayUtil.isNotEmpty(models)) {
			if (CollUtil.isNotEmpty(models)) {
			JSONObject model = (JSONObject) models.get(0);
			if (StrUtil.isEmpty(model.getString("confirmBillingMark")) \|\| StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
			//等待确认
			@@ -1545,7 +2174,7 @@
			invoice.setInvoiceNo(model.getString("redInvoiceNo"));
			invoice.setRedReversal("1");
			//推送BIP
			pushBipInvoice(invoice);
			// pushBipInvoice(invoice);
			}
			}
			}
			@@ -1610,7 +2239,7 @@
			baseMapper.updateById(contractInvoice);
			return R.ok();
			}
			return R.failed(resultJson, "应收发票集成失败");
			return R.failed(result);
			}
			//红票
			if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "2")) {
			@@ -1629,7 +2258,7 @@
			baseMapper.updateById(contractInvoice);
			return R.ok();
			}
			return R.failed(resultJson, "应收发票删除失败");
			return R.failed(result);
			}
			return R.ok();
			}
			@@ -1716,6 +2345,51 @@
			return R.ok();
			}

			@Override
			public ContractInvoice getById(Long id) {
			return baseMapper.selectById(id);
			}

			@Override
			public R bipPushPdf(Long invoiceId) {
			ContractInvoice invoice = baseMapper.selectById(invoiceId);
			pushBipInvoicePdf(invoice);
			return R.ok();
			}

			@Override
			public R selectBipByKey(String dictKey) {
			List<BipDict> bipDictList = bipDictMapper.selectList(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey, dictKey));
			if (CollUtil.isNotEmpty(bipDictList)) {
			// 权限内部门
			List<TreeNode<Long>> collect = bipDictList.stream()
			.map(dict -> {
			TreeNode<Long> treeNode = new TreeNode<>();
			treeNode.setId(dict.getId());
			treeNode.setParentId(dict.getParentId());
			treeNode.setName(dict.getDictName());
			treeNode.setWeight(dict.getDictCode());
			return treeNode;
			})
			.collect(Collectors.toList());

			return R.ok(TreeUtil.build(collect, 0L));
			}
			return R.failed("字典获取失败");
			}

			@Override
			public R saveAndPush(ContractInvoiceUpateDTO upateDTO) {
			ContractInvoice invoice = baseMapper.selectById(upateDTO.getId());
			invoice.setInvoicePreview(upateDTO.getInvoicePreview());
			baseMapper.updateById(invoice);
			R r = bipPush(invoice.getId());
			if (!r.isOk()) {
			return r;
			}
			return bipPushPdf(invoice.getId());
			}

			public static void main(String[] args) {
			File file = new File("d://tmp//" + IdUtil.fastUUID() + ".pdf");
			HttpUtil.downloadFile("http://fp.baiwang.com/format/d?d=BB99645F8ED2AE7D2055E7D29330D366B7CAE92C278C6BB84D222610CEC2118D", file);