From 6b969ca247b98e5a793e61ec5b0d89f4fccb3318 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 16:25:18 +0800
Subject: [PATCH] feat:抵抹账条件新增付款金额小于开票金额，红票审核拒绝后蓝票可重新开红票
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 239 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 157 insertions(+), 82 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index 81b05af..f01f00e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -53,6 +53,7 @@
private final HistoryOverdueMapper historyOverdueMapper;
private final PaymentSlipMapper paymentSlipMapper;
private final BipRequestRecordMapper bipRequestRecordMapper;
+ private final ContractExecDateMapper contractExecDateMapper;
private final RemoteDeptService remoteDeptService;
private final RedisTemplate redisTemplate;
@@ -73,7 +74,7 @@
if (StrUtil.isNotBlank(addDTO.getContractNo())) {
Contract contract = contractService.getOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo, addDTO.getContractNo()));
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
.eq(StrUtil.isNotBlank(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId()));
if (ObjUtil.isNull(customer)) {
return R.failed("瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�");
@@ -98,7 +99,7 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (newtotal.compareTo(new BigDecimal("0")) > 0) {
entity.setTransationAmount(addDTO.getTransationAmount());
@@ -120,7 +121,7 @@
}
//鏇存柊浠樻闃舵浠樻
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2).ne(ContractPaymentSchedule::getPaymentStatus, 3)
.orderByAsc(ContractPaymentSchedule::getCreateTime));
if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
BigDecimal remain = addDTO.getTransationAmount();
@@ -192,7 +193,7 @@
entity.setContractNo(addDTO.getContractNo());
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("");
entity.setTransationAmount(addDTO.getTransationAmount());
BigDecimal newtotal = addDTO.getTransationAmount().multiply(new BigDecimal("-1")).add(lastConfirm.getTotalAmount());
@@ -217,18 +218,28 @@
;
}
}else {
+
List<Contract> customerContractList = contractService.list(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, addDTO.getBusGuestId())
.eq(Contract::getPartyBId,SecurityUtils.getUser().getCompId()).orderByAsc(Contract::getCreateTime).apply(" amount != paid_amount"));
if (ArrayUtil.isEmpty(customerContractList.toArray())) {
return R.failed("涓烘煡璇㈠埌鏈粯娆惧悎鍚�");
}
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getCompanyName, addDTO.getBusGuestName())
+ .eq(StrUtil.isNotBlank(addDTO.getBusGuestName()), BusinessCustomer::getRegisterName, addDTO.getBusGuestName())
.eq(ObjUtil.isNotNull(addDTO.getBusGuestId()), BusinessCustomer::getId, addDTO.getBusGuestId())
.last("limit 1"));
if (ObjUtil.isNull(customer)) {
return R.failed("瀹㈠晢鏌ヨ澶辫触");
}
+ //鏂板浠樻鍗�
+ PaymentSlip slip = new PaymentSlip();
+ slip.setBusGuestId(customer.getId());
+ slip.setBusGuestName(customer.getRegisterName());
+ slip.setPayeeCompId(SecurityUtils.getUser().getCompId());
+ slip.setPaymentTime(addDTO.getConfirmTime());
+ slip.setPaymentAmount(addDTO.getTransationAmount());
+ slip.setPayType(addDTO.getPayType());
+ paymentSlipMapper.insert(slip);
BigDecimal transtionAmount = addDTO.getTransationAmount();
//鍓╀綑浠樻
@@ -243,19 +254,25 @@
List<Contract> advanceContractList = new ArrayList<>();
//浠樻鏃堕棿
Date payDate = addDTO.getConfirmTime();
- for (Contract contract : customerContractList) {
+ Iterator<Contract> iterator = customerContractList.iterator();
+ while (iterator.hasNext()) {
+ Contract contract = iterator.next();
PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
BigDecimal lastTotal = new BigDecimal("0");
if (ObjUtil.isNotNull(lastConfirm)) {
lastTotal = lastConfirm.getTotalAmount();
+ }else {
+
}
//鍚堝悓鏈�杩戞槑缁嗘�婚涓�0 鎴� > 0 鎯呭喌涓�
if (lastTotal.compareTo(new BigDecimal("0")) >= 0) {
log.info("褰撳墠鍚堝悓鍙凤細{},鏄庣粏鎬婚鏃犲簲鏀舵", contract.getContractNo());
advanceContractList.add(contract);
- continue;
+ if (iterator.hasNext()) {
+ continue;
+ }
}
transtionRemainAmount = transtionRemainAmount.add(lastTotal);
@@ -268,12 +285,19 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
- entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
- entity.setTotalAmount(new BigDecimal("0"));
entity.setConfirmTime(payDate);
+ // 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
+ if (!iterator.hasNext()) {
+ entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+ entity.setAdvanceAmount(transtionRemainAmount);
+ entity.setTotalAmount(transtionRemainAmount);
+ }else {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ }
baseMapper.insert(entity);
payContractList.add(contract);
} else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
@@ -285,7 +309,8 @@
break;
} else {
entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
- entity.setTotalAmount(transtionAmount);
+ entity.setReceivableAmount(transtionRemainAmount.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(transtionRemainAmount);
entity.setConfirmTime(payDate);
baseMapper.insert(entity);
payContractList.add(contract);
@@ -297,6 +322,7 @@
//鏇存柊浠樻闃舵浠樻
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
+ .ne(ContractPaymentSchedule::getPaymentStatus, 3)
.orderByAsc(ContractPaymentSchedule::getCreateTime));
if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
BigDecimal remain = transtionAmount;
@@ -351,48 +377,64 @@
//鍚堝悓鎵�鏈変粯娆鹃樁娈�
List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
- );
+ .ne(ContractPaymentSchedule::getPaymentStatus, 3));
if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
- BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
+ BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "2") ? item.getPlannedAmount() :
item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
contract.setPaidAmount(payTotal);
- if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
- contract.setContractStatus(3);
- }
- contractService.updateById(contract);
+// if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+// contract.setContractStatus(3);
+// }
if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+ contract.setBillingStatus("2");
+ contract.setContractStatus(3);
payCompleteContractList.add(contract);
}
//浠樻 涓� 浠樻鏈叏浠�
if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
payNoCompleteContractList.add(contract);
}
+ if (StrUtil.isNotEmpty(contract.getContractCategory())&&StrUtil.equals(contract.getContractCategory(),"water_house")){
+ List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
+ .eq(ContractExecDate::getContractId,contract.getId()).eq(ContractExecDate::getGenFlag,"0"));
+ if (ArrayUtil.isEmpty(execDateList.toArray())){
+ List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()));
+ if (ArrayUtil.isNotEmpty(contractPaymentScheduleList.toArray())&&contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+ contract.setContractStatus(3);
+ contractService.updateById(contract);
+ }
+ }
+ }else {
+ contractService.updateById(contract);
+ }
+
}
});
//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
- if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
- if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
- //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
- Contract lastContract = payNoCompleteContractList.get(0);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
- }
- if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
- //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
- Contract lastContract = advanceContractList.get(0);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
- }
- if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
- &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
- //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
- Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
-
- }
- }
+// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+// if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+// //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+// Contract lastContract = payNoCompleteContractList.get(0);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+// }
+// if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+// Contract lastContract = advanceContractList.get(0);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+// }
+// if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+// &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+// Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,null,lastContract,transtionRemainAmount,payDate);
+//
+// }
+// }
}
return R.ok();
}
@@ -423,7 +465,7 @@
String result = HttpUtil.post(url + "/yonbip/EFI/collection/list?access_token=" + finalAccessToken, params.toJSONString());
log.info("SK_CX Response:{}", result);
//淇濆瓨璇锋眰璁板綍
- saveBipRequestRecord(params, result);
+ saveBipRequestRecord(params,"<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�", result);
JSONObject resultJson = JSONObject.parseObject(result);
if (resultJson.containsKey("code") && resultJson.getString("code").equals("200")) {
handleAndSave(bipCode, resultJson);
@@ -451,7 +493,8 @@
return params;
}
- private void getAccessToken(String accessToken) {
+ @Override
+ public String getAccessToken(String accessToken) {
long timestamp = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("appKey", appKey);
@@ -472,20 +515,22 @@
JSONObject tokenJson = JSONObject.parseObject(getTokenResult);
if (!tokenJson.containsKey("code") || !tokenJson.getString("code").equals("200")) {
log.error("Get access_token ERROR");
- return;
+ return "";
}
if (ObjUtil.isNull(tokenJson.get("data")) || ObjUtil.isNull(JSONObject.parseObject(tokenJson.getString("data")))) {
log.error("access_token value exception");
- return;
+ return "";
}
accessToken = JSONObject.parseObject(tokenJson.getString("data")).getString("access_token");
log.info("access_token value:", accessToken);
redisTemplate.opsForValue().set("BIP_TOKEN", accessToken, tokenJson.getIntValue("expire") - 10, TimeUnit.SECONDS);
+ return accessToken;
}
- private void saveBipRequestRecord(JSONObject params, String result) {
+ @Override
+ public void saveBipRequestRecord(JSONObject params, String methodName, String result) {
BipRequestRecord record = new BipRequestRecord();
- record.setInterfaceName("<XSJZ_SK_CX_001>-鏀舵鍗曟煡璇㈡帴鍙�");
+ record.setInterfaceName(methodName);
record.setRequestParams(params.toJSONString());
record.setResponseParams(result);
record.setResponseCode(JSONObject.parseObject(result).getString("code"));
@@ -526,7 +571,7 @@
return;
}
BusinessCustomer customer = businessCustomerService.getOne(Wrappers.<BusinessCustomer>lambdaQuery()
- .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getCompanyName, record.getString("bodyItemCustomerName"))
+ .eq(StrUtil.isNotBlank(record.getString("bodyItemCustomerName")), BusinessCustomer::getRegisterName, record.getString("bodyItemCustomerName"))
);
if (ObjUtil.isNull(customer)) {
log.error("浠樻鍗昳d锛歿},瀹㈠晢鏌ヨ澶辫触锛岃妫�鏌ュ鍟�", record.getString("id"));
@@ -537,7 +582,7 @@
return;
}
//淇濆瓨浠樻鍗�
- Boolean codeFlag = savePaymentSlip(customer,record);
+ Boolean codeFlag = savePaymentSlip(customer,record,dept);
if (codeFlag){
log.error("浠樻鍗昳d锛歿},浠樻鍗曞凡瀛樺湪");
return;
@@ -555,7 +600,9 @@
List<Contract> advanceContractList = new ArrayList<>();
//浠樻鏃堕棿
Date payDate = DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT);
- for (Contract contract : contractList) {
+ Iterator<Contract> iterator = contractList.iterator();
+ while (iterator.hasNext()) {
+ Contract contract = iterator.next();
PaymentConfirm lastConfirm = baseMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
BigDecimal lastTotal = new BigDecimal("0");
@@ -580,16 +627,23 @@
entity.setScheduleName(lastConfirm.getScheduleName());
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
entity.setIsBip(1);
entity.setPaymentCode(record.getString("code"));
entity.setPayType(record.get("bodyItemSettleModeName") != null ? record.getString("bodyItemSettleModeName").contains("鎵垮厬姹囩エ") ? 1 : 0 : null);
entity.setBipId(record.getString("id"));
if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
- entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
- entity.setTotalAmount(new BigDecimal("0"));
entity.setConfirmTime(payDate);
+ // 鍒ゆ柇鏄惁鏄渶鍚庝竴涓�
+ if (!iterator.hasNext()) {
+ entity.setTransationAmount(transtionRemainAmount.subtract(lastTotal));
+ entity.setAdvanceAmount(transtionRemainAmount);
+ entity.setTotalAmount(transtionRemainAmount);
+ }else {
+ entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
+ entity.setTotalAmount(new BigDecimal("0"));
+ }
baseMapper.insert(entity);
} else if (transtionRemainAmount.compareTo(new BigDecimal("0")) == 0) {
entity.setTransationAmount(lastTotal.multiply(new BigDecimal("-1")));
@@ -609,7 +663,7 @@
payContractList.stream().forEach(contract -> {
//鏇存柊浠樻闃舵浠樻
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2)
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 2).ne(ContractPaymentSchedule::getPaymentStatus, 3)
.orderByAsc(ContractPaymentSchedule::getCreateTime));
if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
BigDecimal remain = transtionAmount;
@@ -663,55 +717,76 @@
}
//鍚堝悓鎵�鏈変粯娆鹃樁娈�
List<ContractPaymentSchedule> payComScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0)
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()).ne(ContractPaymentSchedule::getPaymentStatus, 0).ne(ContractPaymentSchedule::getPaymentStatus,3)
);
if (ArrayUtil.isNotEmpty(payComScheduleList.toArray())){
BigDecimal payTotal = payComScheduleList.stream().map(item->StrUtil.equals(item.getPaymentStatus() + "", "0") ? item.getPlannedAmount() :
item.getActualAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
contract.setPaidAmount(payTotal);
- if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
- contract.setContractStatus(3);
- }
- contractService.updateById(contract);
+// if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+// contract.setContractStatus(3);
+// }
+// contractService.updateById(contract);
+// if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+// payCompleteContractList.add(contract);
+// }
if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
+ contract.setBillingStatus("2");
+ contract.setContractStatus(3);
payCompleteContractList.add(contract);
}
//浠樻 涓� 浠樻鏈叏浠�
if (contract.getAmount().compareTo(contract.getPaidAmount()) > 0) {
payNoCompleteContractList.add(contract);
}
+ if (StrUtil.isNotEmpty(contract.getContractCategory())&&StrUtil.equals(contract.getContractCategory(),"water_house")){
+ List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
+ .eq(ContractExecDate::getContractId,contract.getId()).eq(ContractExecDate::getGenFlag,"0"));
+ if (ArrayUtil.isEmpty(execDateList)){
+ List<ContractPaymentSchedule> contractPaymentScheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId()));
+ if (ArrayUtil.isNotEmpty(contractPaymentScheduleList.toArray())&&contractPaymentScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
+ contract.setContractStatus(3);
+ contractService.updateById(contract);
+ }
+ }
+ }else {
+ contractService.updateById(contract);
+ }
}
});
//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
- if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
- if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
- //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
- Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
- }
- if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
- //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
- Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
- }
- if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
- &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
- //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
- Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
- //淇濆瓨鏄庣粏
- saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
-
- }
- }
+// if (transtionRemainAmount.compareTo(new BigDecimal("0")) > 0) {
+// if (ArrayUtil.isNotEmpty(payNoCompleteContractList.toArray())){
+// //浣欓 鏀惧埌浠樻鏈畬鎴愬悎鍚� 棰勬敹
+// Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+// }
+// if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isNotEmpty(advanceContractList.toArray())){
+// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+// Contract lastContract = payNoCompleteContractList.get(payNoCompleteContractList.size() - 1);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+// }
+// if (ArrayUtil.isEmpty(payNoCompleteContractList.toArray())&&ArrayUtil.isEmpty(advanceContractList.toArray())
+// &&ArrayUtil.isNotEmpty(payCompleteContractList.toArray())) {
+// //瀹㈡埛棰勪粯鏈夊墿浣� 娌℃湁棰勪粯娆剧殑鍚堝悓
+// Contract lastContract = payCompleteContractList.get(payCompleteContractList.size() - 1);
+// //淇濆瓨鏄庣粏
+// saveNewPaymentConfirm(customer,record,lastContract,transtionRemainAmount,payDate);
+//
+// }
+// }
}
- private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record) {
+ private Boolean savePaymentSlip(BusinessCustomer customer, JSONObject record,SysDept dept) {
PaymentSlip slip = new PaymentSlip();
slip.setBusGuestId(customer.getId());
- slip.setBusGuestName(customer.getCompanyName());
+ slip.setBusGuestName(customer.getRegisterName());
+ slip.setPayee(dept.getName());
+ slip.setPayeeCompId(dept.getDeptId());
slip.setPaymentTime(ObjUtil.isNotNull(record.get("billDate"))?
DateUtil.parse(record.getString("billDate"), DatePattern.NORM_DATETIME_FORMAT):new Date());
slip.setPaymentAmount(ObjUtil.isNotNull(record.get("bodyItemOriTaxExcludedAmount"))?record.getBigDecimal("bodyItemOriTaxExcludedAmount"):new BigDecimal("0"));
@@ -746,7 +821,7 @@
}
entity.setBusGuestId(customer.getId());
- entity.setBusGuestName(customer.getCompanyName());
+ entity.setBusGuestName(customer.getRegisterName());
entity.setBusinessType("瀹㈡埛浠樻");
if (ObjUtil.isNotNull(record)){
entity.setIsBip(1);
--
Gitblit v1.9.1