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/BankStatementServiceImpl.java | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 326 insertions(+), 14 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
index 0bc4219..ad2c82a 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/BankStatementServiceImpl.java
@@ -6,8 +6,10 @@
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.admin.api.entity.SysDept;
import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
@@ -20,8 +22,10 @@
import com.by4cloud.platformx.business.mapper.ContractMapper;
import com.by4cloud.platformx.business.service.BankStatementService;
import com.by4cloud.platformx.business.service.PaymentConfirmService;
+import com.by4cloud.platformx.business.vo.StatementContractVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -30,6 +34,7 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 閾惰娴佹按
@@ -52,8 +57,8 @@
@Value("${bip.url}")
private String url;
- @Value("${BWInvoice.flag}")
- private Boolean bwFlag;
+ @Value("${bip.flag}")
+ private Boolean bipFlag;
@Override
public R edit(BankStatementUpdateDTO updateDTO) {
@@ -66,6 +71,15 @@
if (toPaidTotal.compareTo(statement.getTranAmount().subtract(statement.getConfirmAmount()))>0){
return R.failed("纭鏀舵鎬婚涓嶈兘瓒呰繃浜ゆ槗娴佹按閲戦");
}
+
+ //bip鎺ㄩ��
+ if (bipFlag) {
+ R r = pushSaveCollection(statement, updateDTO.getContractCollectionList());
+ if (!r.isOk()){
+ return r;
+ }
+ }
+
statement.setConfirmAmount(statement.getConfirmAmount().add(toPaidTotal));
baseMapper.updateById(statement);
@@ -88,16 +102,10 @@
paymentConfirmService.add(addDTO);
});
-
-
- //bip鎺ㄩ��
- if (bwFlag) {
- pushSaveCollection(statement, updateDTO.getContractCollectionList());
- }
return R.ok();
}
- private void pushSaveCollection(BankStatement statement, List<StatementContractDTO> contractDTOList) {
+ private R pushSaveCollection(BankStatement statement, List<StatementContractDTO> contractDTOList) {
String accessToken = "";
if (redisTemplate.hasKey("BIP_TOKEN")) {
accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
@@ -106,27 +114,33 @@
}
if (StrUtil.isEmpty(accessToken)) {
log.error("bip accessToken 鑾峰彇寮傚父");
- return;
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
}
String finalAccessToken = accessToken;
BusinessCustomer customer = businessCustomerMapper.selectById(statement.getBusGuestId());
if (ObjUtil.isNull(customer)||StrUtil.isEmpty(customer.getBipCode())){
log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
- return;
+ return R.failed("鏌ヨ瀹㈡埛淇℃伅寮傚父");
}
R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ log.info("鏌ヨ鍗曚綅淇℃伅:{}",JSONObject.toJSONString(r.getData()));
if (!r.isOk()){
log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
- return;
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
}
SysDept dept = r.getData();
JSONObject params = genRequestParam(statement,dept,customer,contractDTOList);
log.info("鏀舵鍗曢泦鎴� Request:{}", params.toJSONString());
- String result = HttpUtil.post(url + "/yonbip/EFI/receivable/save?access_token=" + finalAccessToken, params.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/collection/saveandsubmit?access_token=" + finalAccessToken, params.toJSONString());
log.info("鏀舵鍗曢泦鎴� Response:{}", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (!resultJson.getString("code").equals("200")) {
+ return R.failed(resultJson.getString("message"));
+ }
+ return R.ok();
}
private JSONObject genRequestParam(BankStatement statement,SysDept dept,BusinessCustomer customer,List<StatementContractDTO> contractDTOList) {
@@ -139,8 +153,10 @@
data.put("customerCode",customer.getBipCode());//瀹㈡埛缂栫爜
data.put("financeOrgCode",dept.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
data.put("orgCode",dept.getBipCode());//涓氬姟缁勭粐缂栫爜
- data.put("bustypeCode","");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁JHYXGLXT
+ data.put("bustypeCode","ar_colsale");// TODO 浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岃澶囬粯璁BYXGLXT鏆傛椂涓嶈兘鐢�
data.put("oriCurrencyCode","CNY");//甯佺
+ data.put("srcBillType","38");
+ data.put("srcBillNo",statement.getBankSeqNo());
data.put("_status","Insert");
JSONArray bodyItem = new JSONArray();
for (StatementContractDTO statementContractDTO:contractDTOList) {
@@ -156,4 +172,300 @@
jsonObject.put("data",data);
return jsonObject;
}
+
+ @Override
+ public R getHistoryById(Long id) {
+ MPJLambdaWrapper<BankStatementItem> wrapper = new MPJLambdaWrapper<BankStatementItem>()
+ .selectAll(BankStatementItem.class)
+ .select(Contract::getContractNo)
+ .select(Contract::getPartyA)
+ .select(Contract::getAmount)
+ .leftJoin(Contract.class,Contract::getId,BankStatementItem::getContractId)
+ .eq(BankStatementItem::getCompId,SecurityUtils.getUser().getCompId())
+ .orderByDesc(BankStatementItem::getCreateTime);
+ return R.ok(bankStatementItemMapper.selectJoinList(StatementContractVo.class, wrapper));
+ }
+
+ @Override
+ public R delHistoryById(Long id) {
+
+ BankStatementItem statement = bankStatementItemMapper.selectById(id);
+ BankStatement bankStatement = baseMapper.selectById(statement.getStatetId());
+ Contract contract = contractMapper.selectById(statement.getContractId());
+ if (ObjUtil.isNull(contract)){
+ return R.failed("鍚堝悓淇℃伅寮傚父");
+ }
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("瀹㈡埛淇℃伅淇℃伅寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (!r.isOk()){
+ return r;
+ }
+ //bip鎺ㄩ��
+ if (bipFlag) {
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
+ }
+ String finalAccessToken = accessToken;
+ JSONObject request = genRefundParam(bankStatement,statement, contract, customer, r.getData());
+ log.info("鏀舵閫�娆惧崟-閫�娆惧崟涓�鍘嗗彶纭璇锋眰鍏ュ弬锛歿}", request.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/arRefund/saveandsubmit?access_token=" + finalAccessToken, request.toJSONString());
+ log.info("鏀舵閫�娆惧崟-閫�娆惧崟涓�鍘嗗彶纭璇锋眰鍥炲弬:{}", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (!resultJson.getString("code").equals("200")) {
+ return R.failed(resultJson.getString("message"));
+ }
+ }
+ bankStatementItemMapper.deleteById(id);
+
+ bankStatement.setConfirmAmount(bankStatement.getConfirmAmount().subtract(statement.getConfirmAmount()));
+ baseMapper.updateById(bankStatement);
+ return R.ok();
+ }
+
+ private JSONObject genRefundParam(BankStatement bankStatement,BankStatementItem statement, Contract contract,BusinessCustomer customer, SysDept dept) {
+ JSONObject jsonObject = new JSONObject();
+ JSONObject data = new JSONObject();
+ data.put("billDate",DateUtil.now());
+ data.put("exchangeRate","1");//姹囩巼
+ data.put("exchangeRateDate",DateUtil.now());//姹囩巼鏃堕棿
+ data.put("objectType","1");
+ data.put("customerCode",customer.getBipCode());//瀹㈡埛缂栫爜
+ data.put("financeOrgCode",dept.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
+ data.put("orgCode",dept.getBipCode());//涓氬姟缁勭粐缂栫爜
+ data.put("bustypeCode","ar_refsale");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁JHYXGLXT
+ data.put("oriCurrencyCode","CNY");//甯佺
+ data.put("srcBillType","38");
+ data.put("srcBillNo",bankStatement.getBankSeqNo());
+ data.put("_status","Insert");
+ JSONArray bodyItem = new JSONArray();
+ JSONObject item = new JSONObject();
+ item.put("oriTaxIncludedAmount", statement.getConfirmAmount());
+ item.put("contractNo", contract.getContractNo());
+ item.put("quickTypeCode", "1");
+ item.put("_status", "Insert");
+ bodyItem.add(item);
+ data.put("bodyItem",bodyItem);
+ jsonObject.put("data",data);
+ return jsonObject;
+ }
+
+ @Override
+ public R backBal(Long id) {
+ BankStatement bankStatement = baseMapper.selectById(id);
+ BusinessCustomer customer = businessCustomerMapper.selectById(bankStatement.getBusGuestId());
+ if (ObjUtil.isNull(customer)||StrUtil.isEmpty(customer.getBipCode())){
+ log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ return R.failed("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ }
+ SysDept dept = r.getData();
+ List<BankStatementItem> items = bankStatementItemMapper.selectList(Wrappers.<BankStatementItem>lambdaQuery()
+ .eq(BankStatementItem::getStatetId,id));
+ if (bipFlag){
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
+ }
+ String finalAccessToken = accessToken;
+ JSONObject request = genBackBalParam(bankStatement,customer,dept,items);
+ log.info("鏀舵閫�娆惧崟-閫�娆句綑棰濊姹傚叆鍙傦細{}", request.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/arRefund/saveandsubmit?access_token=" + finalAccessToken, request.toJSONString());
+ log.info("鏀舵閫�娆惧崟-閫�娆句綑棰濊姹傚洖鍙�:{}", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (!resultJson.getString("code").equals("200")) {
+ return R.failed(resultJson.getString("message"));
+ }
+ }
+ bankStatement.setTranAmount(bankStatement.getConfirmAmount());
+ baseMapper.updateById(bankStatement);
+ return R.ok();
+ }
+
+ private JSONObject genBackBalParam(BankStatement bankStatement, BusinessCustomer customer, SysDept dept, List<BankStatementItem> items) {
+ JSONObject jsonObject = new JSONObject();
+ JSONObject data = new JSONObject();
+ data.put("billDate",DateUtil.now());
+ data.put("exchangeRate","1");//姹囩巼
+ data.put("exchangeRateDate",DateUtil.now());//姹囩巼鏃堕棿
+ data.put("objectType","1");
+ data.put("customerCode",customer.getBipCode());//瀹㈡埛缂栫爜
+ data.put("financeOrgCode",dept.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
+ data.put("orgCode",dept.getBipCode());//涓氬姟缁勭粐缂栫爜
+ data.put("bustypeCode","ar_refsale");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁JHYXGLXT
+ data.put("oriCurrencyCode","CNY");//甯佺
+ data.put("srcBillType","38");
+ data.put("srcBillNo",bankStatement.getBankSeqNo());
+ data.put("_status","Insert");
+ JSONArray bodyItem = new JSONArray();
+ JSONObject item = new JSONObject();
+ item.put("oriTaxIncludedAmount", bankStatement.getTranAmount().subtract(bankStatement.getConfirmAmount()));
+ item.put("quickTypeCode", "1");
+ item.put("_status", "Insert");
+ bodyItem.add(item);
+ data.put("bodyItem",bodyItem);
+ jsonObject.put("data",data);
+ return jsonObject;
+ }
+
+ @Override
+ public R backAll(Long id) {
+ BankStatement bankStatement = baseMapper.selectById(id);
+ BusinessCustomer customer = businessCustomerMapper.selectById(bankStatement.getBusGuestId());
+ if (ObjUtil.isNull(customer)||StrUtil.isEmpty(customer.getBipCode())){
+ log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ return R.failed("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ }
+ SysDept dept = r.getData();
+ List<BankStatementItem> items = bankStatementItemMapper.selectList(Wrappers.<BankStatementItem>lambdaQuery()
+ .eq(BankStatementItem::getStatetId,id));
+ if (bipFlag){
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
+ }
+ String finalAccessToken = accessToken;
+ JSONObject request = genBackAllParam(bankStatement,customer,dept,items);
+ log.info("鏀舵閫�娆惧崟-閫�娆炬墍鏈夎姹傚叆鍙傦細{}", request.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/arRefund/saveandsubmit?access_token=" + finalAccessToken, request.toJSONString());
+ log.info("鏀舵閫�娆惧崟-閫�娆炬墍鏈夎姹傚洖鍙�:{}", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (!resultJson.getString("code").equals("200")) {
+ return R.failed(resultJson.getString("message"));
+ }
+ }
+ bankStatement.setConfirmAmount(new BigDecimal("0"));
+ baseMapper.updateById(bankStatement);
+ return R.ok();
+ }
+
+ private JSONObject genBackAllParam(BankStatement bankStatement, BusinessCustomer customer, SysDept dept, List<BankStatementItem> items) {
+ JSONObject jsonObject = new JSONObject();
+ JSONObject data = new JSONObject();
+ data.put("billDate",DateUtil.now());
+ data.put("exchangeRate","1");//姹囩巼
+ data.put("exchangeRateDate",DateUtil.now());//姹囩巼鏃堕棿
+ data.put("objectType","1");
+ data.put("customerCode",customer.getBipCode());//瀹㈡埛缂栫爜
+ data.put("financeOrgCode",dept.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
+ data.put("orgCode",dept.getBipCode());//涓氬姟缁勭粐缂栫爜
+ data.put("bustypeCode","ar_refsale");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁JHYXGLXT
+ data.put("oriCurrencyCode","CNY");//甯佺
+ data.put("srcBillType","38");
+ data.put("srcBillNo",bankStatement.getBankSeqNo());
+ data.put("_status","Insert");
+ JSONArray bodyItem = new JSONArray();
+ JSONObject item = new JSONObject();
+ item.put("oriTaxIncludedAmount", bankStatement.getTranAmount());
+ item.put("quickTypeCode", "1");
+ item.put("_status", "Insert");
+ bodyItem.add(item);
+ data.put("bodyItem",bodyItem);
+ jsonObject.put("data",data);
+ return jsonObject;
+ }
+
+ @Override
+ public R backHis(Long id) {
+ BankStatement bankStatement = baseMapper.selectById(id);
+ BusinessCustomer customer = businessCustomerMapper.selectById(bankStatement.getBusGuestId());
+ if (ObjUtil.isNull(customer)||StrUtil.isEmpty(customer.getBipCode())){
+ log.error("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ return R.failed("鏌ヨ瀹㈡埛淇℃伅寮傚父");
+ }
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ log.error("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ return R.failed("鏌ヨ鍗曚綅淇℃伅寮傚父");
+ }
+ SysDept dept = r.getData();
+ List<BankStatementItem> items = bankStatementItemMapper.selectList(Wrappers.<BankStatementItem>lambdaQuery()
+ .eq(BankStatementItem::getStatetId,id));
+ if (bipFlag){
+ String accessToken = "";
+ if (redisTemplate.hasKey("BIP_TOKEN")) {
+ accessToken = (String) redisTemplate.opsForValue().get("BIP_TOKEN");
+ } else {
+ accessToken = paymentConfirmService.getAccessToken(accessToken);
+ }
+ if (StrUtil.isEmpty(accessToken)) {
+ log.error("bip accessToken 鑾峰彇寮傚父");
+ return R.failed("bip accessToken 鑾峰彇寮傚父");
+ }
+ String finalAccessToken = accessToken;
+ JSONObject request = genBackHisParam(bankStatement,customer,dept,items);
+ log.info("鏀舵閫�娆惧崟-閫�娆惧巻鍙茬‘璁よ姹傚叆鍙傦細{}", request.toJSONString());
+ String result = HttpUtil.post(url + "/yonbip/EFI/arRefund/saveandsubmit?access_token=" + finalAccessToken, request.toJSONString());
+ log.info("鏀舵閫�娆惧崟-閫�娆惧巻鍙茬‘璁よ姹傚洖鍙�:{}", result);
+ JSONObject resultJson = JSONObject.parseObject(result);
+ if (!resultJson.getString("code").equals("200")) {
+ return R.failed(resultJson.getString("message"));
+ }
+ }
+
+ bankStatement.setConfirmAmount(new BigDecimal("0"));
+ baseMapper.updateById(bankStatement);
+ bankStatementItemMapper.deleteByIds(items.stream().map(item->item.getId()).collect(Collectors.toList()));
+ return R.ok();
+ }
+
+ private JSONObject genBackHisParam(BankStatement bankStatement, BusinessCustomer customer, SysDept dept,List<BankStatementItem> items) {
+ JSONObject jsonObject = new JSONObject();
+ JSONObject data = new JSONObject();
+ data.put("billDate",DateUtil.now());
+ data.put("exchangeRate","1");//姹囩巼
+ data.put("exchangeRateDate",DateUtil.now());//姹囩巼鏃堕棿
+ data.put("objectType","1");
+ data.put("customerCode",customer.getBipCode());//瀹㈡埛缂栫爜
+ data.put("financeOrgCode",dept.getBipCode());//寮�绁ㄧ粍缁囩紪鐮�
+ data.put("orgCode",dept.getBipCode());//涓氬姟缁勭粐缂栫爜
+ data.put("bustypeCode","ar_refsale");//浜ゆ槗绫诲瀷缂栫爜 鏆備及榛樿ZGYSFP锛岄攢鍞粯璁JHYXGLXT
+ data.put("oriCurrencyCode","CNY");//甯佺
+ data.put("srcBillType","38");
+ data.put("srcBillNo",bankStatement.getBankSeqNo());
+ data.put("_status","Insert");
+ JSONArray bodyItem = new JSONArray();
+ for (BankStatementItem statementItem:items) {
+ Contract contract = contractMapper.selectById(statementItem.getContractId());
+ JSONObject item = new JSONObject();
+ item.put("oriTaxIncludedAmount", statementItem.getConfirmAmount());
+ item.put("contractNo", contract.getContractNo());
+ item.put("quickTypeCode", "1");
+ item.put("_status", "Insert");
+ bodyItem.add(item);
+ }
+ data.put("bodyItem",bodyItem);
+ jsonObject.put("data",data);
+ return jsonObject;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1