From 21dfddd6e09d32a50a636fff62a3d8a2ed362d5a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 20 八月 2026 16:29:49 +0800
Subject: [PATCH] feat：合同标的物新增导入 银行流水强制确认 简易合同新增 发票重开 合同标的物导入
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 154 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 124 insertions(+), 30 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 9325098..976dd7c 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
@@ -507,7 +507,7 @@
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
contractOutBound.setInvoiceStatus("1");
if (contractOutBoundInvoiceVo.getInvoiceNum().compareTo(contractOutBound.getOutBoundNum().subtract(contractOutBound.getInvoiceNum())) <= 0) {
- contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().subtract(contractOutBoundInvoiceVo.getInvoiceNum()));
+ contractOutBound.setInvoiceNum(contractOutBound.getInvoiceNum().add(contractOutBoundInvoiceVo.getInvoiceNum()));
}
contractOutBoundMapper.updateById(contractOutBound);
});
@@ -550,11 +550,13 @@
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", invoiceItemVo.getUnit());
invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
- invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
+// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
if (!StrUtil.equals(vo.getContractCategory(), "water_house")) {
invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax());
} else {
@@ -565,7 +567,7 @@
invoiceDetailsList.add(invoiceDetail);
lineNo++;
}
- jsonObject.put("invoiceDetailsList", invoiceDetailsList);
+ data.put("invoiceDetailsList", invoiceDetailsList);
//璐柟
data.put("buyerTaxNo", vo.getPartyAOrgCode());
data.put("buyerName", vo.getPartyA());
@@ -691,7 +693,7 @@
invoiceDetail.put("goodsTaxRate", invoiceItemVo.getTaxRate().divide(new BigDecimal("100")));
invoiceDetail.put("goodsUnit", invoiceItemVo.getUnit());
invoiceDetail.put("goodsQuantity", invoiceItemVo.getQuantity());
- invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
+// invoiceDetail.put("goodsPrice", invoiceItemVo.getUnitPrice());
invoiceDetail.put("goodsTotalPrice", invoiceItemVo.getPriceNoTax().multiply(new BigDecimal("-1")));
invoiceDetail.put("goodsTotalTax", invoiceItemVo.getPriceTax().multiply(new BigDecimal("-1")));
invoiceDetailsList.add(invoiceDetail);
@@ -706,19 +708,22 @@
public R queryBlueInvoice() {
if (bwFlag) {
List<ContractInvoice> contractInvoices = baseMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery()
- .eq(ContractInvoice::getInvoiceCategory, "1").eq(ContractInvoice::getInvoiceStatus, "1"));
+ .eq(ContractInvoice::getApprovalStatus, "1")
+ .eq(ContractInvoice::getBwRequestResult,"1")
+ .isNull(ContractInvoice::getInvoicePath));
if (ArrayUtil.isNotEmpty(contractInvoices)) {
contractInvoices.stream().forEach(contractInvoice -> {
JSONObject request = new JSONObject();
request.put("taxNo", contractInvoice.getTaxNo());
JSONObject data = new JSONObject();
- data.put("taxNo", contractInvoice.getSerialNo());
+ data.put("serialNo", contractInvoice.getSerialNo());
data.put("returnType", "3");
data.put("invoiceIssueMode", "1");
+ request.put("data",data);
String requestId = IdUtil.fastUUID();
log.info("serial_no:{},鍙戠エ鏌ヨ鍏ュ弬锛歿},", contractInvoice.getSerialNo(), request.toJSONString());
- String result = HttpUtil.post("method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
+ String result = HttpUtil.post(bwUrl+"method=baiwang.output.format.query&version=1.0&request_id=" + requestId, request.toJSONString());
log.info("serial_no:{},鍙戠エ鏌ヨ鍥炲弬锛歿},", contractInvoice.getSerialNo(), result);
saveBwRequestRecord("baiwang.output.format.query", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
@@ -728,8 +733,6 @@
contractInvoice.setInvoiceStatus("2");
baseMapper.updateById(contractInvoice);
}
- //鎺ㄩ�丅IP
- pushBipInvoice(contractInvoice);
});
}
}
@@ -768,11 +771,11 @@
JSONObject params = genBlueReceiveParams(contractInvoice, contract, customer, dept);
String finalAccessToken = accessToken;
- log.info("XSJZ_YS_DJ_INSERT Request:{}", params.toJSONString());
+ log.info("搴旀敹鍙戠エ闆嗘垚鍏ュ弬:{}", params.toJSONString());
String result = HttpUtil.post(url + "/yonbip/EFI/receivable/save?access_token=" + finalAccessToken, params.toJSONString());
- log.info("XSJZ_YS_DJ_INSERT Response:{}", result);
+ log.info("搴旀敹鍙戠エ闆嗘垚鍥炲弬:{}", result);
//淇濆瓨璇锋眰璁板綍
- paymentConfirmService.saveBipRequestRecord(params, "< XSJZ_YS_DJ_001>-搴旀敹鍙戠エ淇濆瓨鎺ュ彛", result);
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ闆嗘垚鎺ュ彛", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
JSONObject data = resultJson.getJSONObject("data");
@@ -787,11 +790,11 @@
JSONObject params = genRedReceiveParams(contractInvoice);
String finalAccessToken = accessToken;
- log.info("XSJZ_YS_DJ_DELETE Request:", params.toJSONString());
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍏ュ弬:{}", params.toJSONString());
String result = HttpUtil.post(url + "/yonbip/EFI/receivable/delete?access_token=" + finalAccessToken, params.toJSONString());
- log.info("XSJZ_YS_DJ_DELETE Response:{}", result);
+ log.info("搴旀敹鍙戠エ鍒犻櫎鍥炲弬:{}", result);
//淇濆瓨璇锋眰璁板綍
- paymentConfirmService.saveBipRequestRecord(params, "< XSJZ_YS_DJ_002>-搴旀敹鍙戠エ鍒犻櫎鎺ュ彛", result);
+ paymentConfirmService.saveBipRequestRecord(params, "搴旀敹鍙戠エ鍒犻櫎鎺ュ彛", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
contractInvoice.setBipPush("1");
@@ -898,6 +901,7 @@
vo.setContractCategory(contract.getContractCategory());
invoice.setApprovalStatus("1");
baseMapper.updateById(invoice);
+ invoice.setBwRequestResult("0");
//钃濈エ
if (invoice.getInvoiceCategory().equals("1")) {
// TODO 寮�钃濈エ鎺ュ彛
@@ -905,23 +909,29 @@
if (bwFlag) {
String requestId = IdUtil.fastUUID();
invoice.setBwRequestId(requestId);
- log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬", request.toJSONString());
+ invoice.setBwRequestResult("1");
+ invoice.setBwRequestParam(request.toJSONString());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬:{}", request.toJSONString());
String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, request.toJSONString());
- log.info("钃濈エ璇锋眰鎺ュ彛鍥炲弬", result);
+ 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.error("寮�绁ㄥけ璐ワ紒锛侊紒");
- return;
+ resultObj.getBoolean("success")) {
+ log.info("寮�绁ㄦ垚鍔燂紒锛侊紒");
+ invoice.setBwRequestResult("1");
}
JSONObject modelJson = resultObj.getJSONObject("model");
- JSONArray models = modelJson.getJSONArray("success");
- if (ArrayUtil.isNotEmpty(models)) {
- JSONObject model = (JSONObject) models.get(0);
- Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
- invoice.setInvoiceTime(invoiceDate);
- invoice.setInvoiceNo(model.getString("invoiceNo"));
+ if (ObjUtil.isNotNull(modelJson)) {
+ JSONArray models = modelJson.getJSONArray("success");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(model.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
}
}
if (StrUtil.isNotBlank(vo.getAdvanceInvoice())){
@@ -938,6 +948,13 @@
}
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) {
@@ -979,6 +996,7 @@
}
contractMapper.updateById(contract);
}
+ baseMapper.updateById(invoice);
}
//绾㈢エ
if (invoice.getInvoiceCategory().equals("2")) {
@@ -987,6 +1005,7 @@
JSONObject request = genRedInvoice(contract, blueInvoice, invoice.getSerialNo());
String requestId = IdUtil.fastUUID();
invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(request.toJSONString());
if (bwFlag) {
log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ叆鍙�:{}", request.toJSONString());
String result = HttpUtil.post(bwUrl + "method=baiwang.output.redinvoice.add&version=1.0&requestId=" + requestId, request.toJSONString());
@@ -994,12 +1013,13 @@
saveBwRequestRecord("baiwang.output.redinvoice.add", requestId, request.toJSONString(), result);
JSONObject resultObj = JSONObject.parseObject(result);
if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
- !resultObj.getBoolean("success")) {
- log.error("绾㈠瓧纭鍗曞け璐ワ紒锛侊紒");
- return;
+ resultObj.getBoolean("success")) {
+ log.info("绾㈠瓧纭鍗曟垚鍔燂紒锛侊紒");
+ 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")) {
@@ -1014,6 +1034,7 @@
}
}
}
+ baseMapper.updateById(invoice);
contract.setBillingAmout(contract.getBillingAmout().subtract(invoice.getInvoiceTotalPriceTax()));
//闃叉閲嶅瀹″紑绁ㄥ鏍搁�氳繃鍚� 寮�绁ㄩ噾棰濅负璐�
if (contract.getBillingAmout().compareTo(new BigDecimal("0")) < 0) {
@@ -1120,4 +1141,77 @@
public Page pageScope(Page page, ContractQueryDTO queryDTO) {
return baseMapper.pageScope(page, queryDTO, DataScope.of("comp_id"));
}
+
+ @Override
+ public R refresh(Long invoiceId) {
+ ContractInvoice invoice = baseMapper.selectById(invoiceId);
+ //钃濈エ
+ if (invoice.getInvoiceCategory().equals("1")) {
+ // TODO 寮�钃濈エ鎺ュ彛
+ if (bwFlag) {
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestResult("1");
+ invoice.setBwRequestParam(invoice.getBwRequestParam());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍏ュ弬:{}", invoice.getBwRequestParam());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.invoice.issue&version=1.0&requestId=" + requestId, invoice.getBwRequestParam());
+ log.info("钃濈エ璇锋眰鎺ュ彛鍥炲弬:{}", result);
+ saveBwRequestRecord("baiwang.output.invoice.issue", requestId, invoice.getBwRequestParam(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ log.error("寮�绁ㄥけ璐ワ紒锛侊紒");
+ return R.failed(resultObj.getString("message"));
+ }
+ invoice.setBwRequestResult("1");
+ JSONObject modelJson = resultObj.getJSONObject("model");
+ JSONArray models = modelJson.getJSONArray("success");
+ if (CollUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ Date invoiceDate = DateUtil.parse(model.getString("invoiceDate"), DatePattern.PURE_DATETIME_PATTERN);
+ invoice.setInvoiceTime(invoiceDate);
+ invoice.setInvoiceNo(model.getString("invoiceNo"));
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
+ }
+ }
+ //绾㈢エ
+ if (invoice.getInvoiceCategory().equals("2")) {
+ // TODO 寮�绾㈢エ鎺ュ彛
+ String requestId = IdUtil.fastUUID();
+ invoice.setBwRequestId(requestId);
+ invoice.setBwRequestParam(invoice.getBwRequestParam());
+ if (bwFlag) {
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ叆鍙�:{}", invoice.getBwRequestParam());
+ String result = HttpUtil.post(bwUrl + "method=baiwang.output.redinvoice.add&version=1.0&requestId=" + requestId, invoice.getBwRequestParam());
+ log.info("绾㈠瓧纭鍗曡姹傛帴鍙ｅ洖鍙�:{}", result);
+ saveBwRequestRecord("baiwang.output.redinvoice.add", requestId, invoice.getBwRequestParam(), result);
+ JSONObject resultObj = JSONObject.parseObject(result);
+ if (resultObj.containsKey("requestId") && StrUtil.equals(resultObj.getString("requestId"), requestId) &&
+ !resultObj.getBoolean("success")) {
+ log.error("绾㈠瓧纭鍗曟垚鍔燂紒锛侊紒");
+
+ return R.failed(resultObj.getString("message"));
+ }
+ invoice.setBwRequestResult("1");
+ JSONArray models = resultObj.getJSONArray("model");
+ if (ArrayUtil.isNotEmpty(models)) {
+ JSONObject model = (JSONObject) models.get(0);
+ if (StrUtil.isEmpty(model.getString("confirmBillingMark")) || StrUtil.equals(model.getString("confirmBillingMark"), "N")) {
+ //绛夊緟纭
+ invoice.setRedReversal("3");
+ } else if (StrUtil.equals(model.getString("confirmBillingMark"), "Y")) {
+ //纭鍗冲紑
+ invoice.setInvoiceNo(model.getString("redInvoiceNo"));
+ invoice.setRedReversal("1");
+ //鎺ㄩ�丅IP
+ pushBipInvoice(invoice);
+ }
+ }
+ }
+ }
+ baseMapper.updateById(invoice);
+ return R.ok();
+ }
}
--
Gitblit v1.9.1