From 96118de3ac74f5468cf5d4ac73d6ea3bec1da010 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 20 十一月 2026 14:36:25 +0800
Subject: [PATCH] feat:新增销售指标 产品板块 重点工作 专项业务 产品收入和合同统计修改功能 feat:承兑新增承兑编号字段 feat:客商主数据更新名称 专项业务去年同月字段 机动车销售发票地址字段及判断 feat:银行流水更新客户id feat:机动车销售发票新增税务及代码字段 feat:流水更新按钮参数 feat:检索新增标的物运维按钮

---
 platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java |  171 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 106 insertions(+), 65 deletions(-)

diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
index eb81cc1..6cc29b4 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
@@ -234,22 +234,18 @@
 				}
 				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)) {
+				if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + 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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+						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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+						return R.failed("璇锋鏌ヤ骇鍝佺紪鐮佹槸鍚﹀瓨鍦ㄦ垨璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
 					}
 				}
 			}
@@ -288,22 +284,18 @@
 			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)) {
+			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + 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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+					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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+					return R.failed("璇锋鏌ヤ骇鍝佺紪鐮佹槸鍚﹀瓨鍦ㄦ垨璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
 				}
 			}
 
@@ -311,11 +303,11 @@
 		//鏈哄姩杞﹀紑绁�
 		if (StrUtil.equals(genInvoiceInfoDTO.getInvoiceType(), "4")) {
 			if (StrUtil.isBlank(genInvoiceInfoDTO.getVehicleNo())) {
-				return R.failed("鏈哄姩杞﹀紑绁ㄨ杈撳叆杞︽灦鍙�");
+				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杈�");
+				return R.failed("鏈哄姩杞﹂攢鍞彂绁ㄥ彧鑳�1娆″紑1杈�");
 			}
 			JSONObject request = genQueryVinParam(genInvoiceInfoDTO.getVehicleNo(), b);
 			R r1 = requestQueryVehicleNo(request);
@@ -351,22 +343,18 @@
 			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)) {
+			if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + 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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+					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("璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
+					return R.failed("璇锋鏌ヤ骇鍝佺紪鐮佹槸鍚﹀瓨鍦ㄦ垨璇峰湪浜у搧淇℃伅涓ˉ鍏呯◣鏀跺垎绫讳俊鎭�");
 				}
 			}
 
@@ -414,12 +402,8 @@
 					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)) {
+					if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
 						product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
 								.in(Product::getCompId, smjList).last("limit 1"));
 					} else {
@@ -508,6 +492,7 @@
 
 		log.info("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ鎺ュ彛鍏ュ弬锛歿},", request.toJSONString());
 		String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.queryVinDetail&version=1.0&request_id=" + requestId, request.toJSONString());
+//		String result = "{\"success\":true,\"requestId\":\"5c2bc8a3-1399-4ff0-a039-92688c6740e0\",\"model\":[{\"engineNo\":\"5210F866\",\"vehicleName\":\"杞胯溅\",\"vehicleSourceCode\":\"\",\"passengersLimited\":\"\",\"originPlace\":\"\",\"vehicleManufactureDate\":\"\",\"vehicleIdForAccountingUuid\":\"\",\"brandModel\":\"鍖椾含鐗�/BJJBJJ7201TN\",\"certificateInvoiceFlag\":\"\\\"certificateInvoiceFlag\\\": \\\"Y\\\"\",\"importCertificateNo\":\"HWJC22411181133\",\"certificateNo\":\"WZHGZBH22411181133\",\"paymentVoucherNo\":\"\",\"certificateStatusCode\":\"\\\"certificateStatusCode\\\": \\\"0\\\"\",\"vehicleNo\":\"CLSBDH22406190234\",\"invoiceUnavailableReasonCode\":\"\",\"manufacturingEnterprise\":\"浣涘北绠�鎹烽櫠鐡锋潗鏂欑鎶�鏈夐檺鍏徃\",\"invoiceUnavailableReasonDesc\":\"\",\"tonnage\":0,\"inspectionListNo\":\"\",\"vehicleType\":\"\"}]}";
 		log.info("鏈哄姩杞﹀悎鏍艰瘉鏌ヨ鎺ュ彛鍥炲弬锛歿},", result);
 		saveBwRequestRecord("baiwang.output.invoice.queryVinDetail", requestId, request.toJSONString(), result);
 		JSONObject resultObj = JSONObject.parseObject(result);
@@ -545,9 +530,9 @@
 
 	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());
+//		String result = "{\"success\":true,\"requestId\":\"5c2bc8a3-1399-4ff0-a039-92688c6740e0\",\"model\":[{\"vehicleNo\":\"\",\"isNotOpenInvReason\":\"\",\"isOpenInvoice\":true}]}";
 		log.info("鏌ヨ绋庡眬杞︽灦鍙风爜鍥炲弬锛歿},", result);
 		saveBwRequestRecord("baiwang.output.einvoice.queryvinlist", requestId, request.toJSONString(), result);
 		JSONObject resultObj = JSONObject.parseObject(result);
@@ -588,6 +573,12 @@
 		vo.setPartyBBankAccount(b.getOrgBankAccount());
 		vo.setInvoiceType(a.getInvoiceType());
 		vo.setRemarks(genInvoiceInfoDTO.getRemarks());
+		if (StrUtil.isNotBlank(b.getOrgContact())) {
+			vo.setContact(b.getOrgContact());
+		}
+		if (StrUtil.isNotBlank(b.getOrgAddress())) {
+			vo.setAddress(b.getOrgAddress());
+		}
 		vo.setOutBoundInvoiceList(genInvoiceInfoDTO.getOutBoundInvoiceList());
 		if (StrUtil.isNotBlank(genInvoiceInfoDTO.getInvoiceType())) {
 			vo.setInvoiceVehicleType(genInvoiceInfoDTO.getInvoiceType());
@@ -600,6 +591,9 @@
 		}
 		if (StrUtil.isNotBlank(genInvoiceInfoDTO.getVehicleData())) {
 			vo.setVehicleData(genInvoiceInfoDTO.getVehicleData());
+		}
+		if (StrUtil.isNotBlank(genInvoiceInfoDTO.getSwjg())) {
+			vo.setSwjg(genInvoiceInfoDTO.getSwjg());
 		}
 		List<InvoiceItemVo> invoiceItemVoList = new ArrayList<>();
 		List<String> erpCode = new ArrayList<>();
@@ -619,12 +613,8 @@
 				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)) {
+				if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
 					product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
 							.in(Product::getCompId, smjList).last("limit 1"));
 				} else {
@@ -690,12 +680,8 @@
 						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)) {
+						if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
 							product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
 									.in(Product::getCompId, smjList).last("limit 1"));
 						} else {
@@ -761,14 +747,24 @@
 						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"));
+						List<String> smjList = new ArrayList<>();
+						smjList.add(smj);
+						smjList.add(smjhw);
+						Product product = null;
+						if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+							product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
+									.in(Product::getCompId, smjList).last("limit 1"));
+						} else {
+							product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.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());
 						}
+
 						ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
 								.eq(ContractSubjectMatter::getMaterialCode, schedule.getSubjectMatterCode())
 								.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
@@ -846,8 +842,17 @@
 						mergeVo.setMaterialCode(subjectMatter.getMaterialCode());
 						mergeVo.setMaterialInternalName(subjectMatter.getMaterialName());
 						mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
-						Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
-								.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+						List<String> smjList = new ArrayList<>();
+						smjList.add(smj);
+						smjList.add(smjhw);
+						Product product = null;
+						if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+							product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
+									.in(Product::getCompId, smjList).last("limit 1"));
+						} else {
+							product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
+									.eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+						}
 						if (ObjUtil.isNotNull(product)) {
 							mergeVo.setTaxClass(product.getTaxClass());
 							mergeVo.setSpecification(product.getProductType());
@@ -1404,7 +1409,7 @@
 		}
 		BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
 		if (ObjUtil.isNull(customer) || StrUtil.isEmpty(customer.getBipCode())) {
-			log.error("鏌ヨ鍚堝悓淇℃伅寮傚父");
+			log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
 			return;
 		}
 		R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
@@ -1413,16 +1418,16 @@
 			return;
 		}
 		SysDept comp = r.getData();
-		R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
-		if (!r.isOk()) {
-			log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
-			return;
-		}
-		SysDept dept = rDept.getData();
+//		R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+//		if (!r.isOk()) {
+//			log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+//			return;
+//		}
+//		SysDept dept = rDept.getData();
 		//钃濈エ
 		if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "1")) {
 
-			JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp, dept);
+			JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp);
 			String finalAccessToken = accessToken;
 
 			log.info("搴旀敹鍙戠エ闆嗘垚鍏ュ弬:{}", params.toJSONString());
@@ -1468,7 +1473,8 @@
 	}
 
 	private JSONObject genBlueReceiveParams(ContractInvoice contractInvoice, Contract contract, BusinessCustomer customer
-			, SysDept comp, SysDept dept) {
+			, SysDept comp) {
+		GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(contractInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
 		JSONObject jsonObject = new JSONObject();
 		JSONObject data = new JSONObject();
 		if (contractInvoice.getInvoiceCategory().equals("1")) {
@@ -1480,17 +1486,17 @@
 		data.put("exchangeRate", "1");//姹囩巼
 		data.put("exchangeRateDate", DateUtil.now());//姹囩巼鏃堕棿
 		data.put("objectType", "1");//寰�鏉ュ璞$被鍨�(鏋氫妇鍊� 1:瀹㈡埛; 2:鍛樺伐;3:璧勯噾涓氬姟瀵硅薄)
-		data.put("deptCode", dept.getOrgCode());//閮ㄩ棬缂栫爜 SS2
-		data.put("staffCode", SecurityUtils.getUser().getNickname());//涓氬姟鍛樼紪鐮�
+		data.put("deptCode", vo.getBipVo().getBm());//閮ㄩ棬缂栫爜 SS2
+		data.put("staffCode", vo.getBipVo().getYwy());//涓氬姟鍛樼紪鐮�
 		data.put("customerCode", customer.getBipCode());//瀹㈡埛缂栫爜
 		data.put("financeOrgCode", comp.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
 		data.put("orgCode", comp.getBipCode());//涓氬姟缁勭粐缂栫爜
-		data.put("bustypeCode", "ZBYXGLXT");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁BYXGLXT
+		data.put("bustypeCode", "ZBYXGLXT");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁BYXGLXT  ar_invoice 搴旀敹鍙戠エ
 		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.getBipVo().getItemList()) {
 			JSONObject item = new JSONObject();
@@ -1723,7 +1729,8 @@
 						contract.setBillingStatus("3");
 					}
 					if (contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0 &&
-							contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
+							contract.getBillingAmout().compareTo(contract.getAmount()) == 0&&
+							StrUtil.isBlank(contract.getNextScheduleName())) {
 						contract.setContractStatus(3);
 					}
 					if (contract.getBillingAmout().compareTo(contract.getAmount()) < 0) {
@@ -1760,7 +1767,8 @@
 							contract.setBillingStatus("3");
 						}
 						if (contract.getBillingAmout().compareTo(contract.getAmount()) == 0 &&
-								contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0) {
+								contract.getPaidAmount().compareTo(contract.getAmount().subtract(contract.getDropAmount())) >= 0&&
+								StrUtil.isBlank(contract.getNextScheduleName())) {
 							contract.setBillingStatus("3");
 							contract.setContractStatus(3);
 						}
@@ -2214,16 +2222,16 @@
 		}
 		SysDept comp = r.getData();
 
-		R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
-		if (!r.isOk()) {
-			log.error("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
-			return R.failed("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
-		}
-		SysDept dept = rDept.getData();
+//		R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+//		if (!r.isOk()) {
+//			log.error("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
+//			return R.failed("鏌ヨ閮ㄩ棬淇℃伅寮傚父");
+//		}
+//		SysDept dept = rDept.getData();
 
 		//钃濈エ
 		if (StrUtil.equals(contractInvoice.getInvoiceCategory(), "1")) {
-			JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp, dept);
+			JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, comp);
 			String finalAccessToken = accessToken;
 
 			log.info("搴旀敹鍙戠エ闆嗘垚鍏ュ弬:{}", params.toJSONString());
@@ -2380,6 +2388,28 @@
 	}
 
 	@Override
+	public R selectZbByKey(String dictKey) {
+		List<BipDict> bipDictList = bipDictMapper.selectList(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey, dictKey)
+				.eq(BipDict::getCompId,SecurityUtils.getUser().getCompId()));
+		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());
@@ -2391,6 +2421,17 @@
 		return bipPushPdf(invoice.getId());
 	}
 
+	@Override
+	public R updBwParamById(UpdBwParamDTO dto) {
+		ContractInvoice invoice = baseMapper.selectById(dto.getId());
+		if (ObjUtil.isNull(invoice)){
+			return R.failed("鍙戠エ淇℃伅寮傚父");
+		}
+		invoice.setBwRequestParam(dto.getBwRequestParam());
+		baseMapper.updateById(invoice);
+		return R.ok();
+	}
+
 	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);

--
Gitblit v1.9.1