From 5b1c84423d590c7240209fa9a68d33c0116457af Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 26 五月 2026 17:27:03 +0800
Subject: [PATCH] feat:测试调整
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java | 4
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 46 ++++---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 140 ++++++++++++++---------
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 35 +++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 83 +++++++------
6 files changed, 191 insertions(+), 119 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java
index 08e8459..7af53b3 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/PaymentOffsetController.java
@@ -52,7 +52,7 @@
wrapper.like(StrUtil.isNotBlank(paymentOffset.getBusGuestName()),PaymentOffset::getBusGuestName,paymentOffset.getBusGuestName());
wrapper.like(StrUtil.isNotBlank(paymentOffset.getContractName()),PaymentOffset::getContractName,paymentOffset.getContractName());
wrapper.orderByDesc(PaymentOffset::getCreateTime);
- return R.ok(paymentOffsetService.page(page, wrapper));
+ return R.ok(paymentOffsetService.pageByScope(page, wrapper));
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java
index 18e75e9..3454ece 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/PaymentOffsetService.java
@@ -1,10 +1,10 @@
package com.by4cloud.platformx.business.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.by4cloud.platformx.business.entity.PaymentOffset;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.data.mybatis.IIService;
-public interface PaymentOffsetService extends IService<PaymentOffset> {
+public interface PaymentOffsetService extends IIService<PaymentOffset> {
R add(PaymentOffset paymentOffset);
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index 378b775..817cc74 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -176,6 +176,18 @@
currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(currentConfim);
+ //鏇存柊褰撳墠闃舵浠樻鎯呭喌
+ if (lastTotal.compareTo(new BigDecimal("0"))>0){
+ if (currentConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
+ schedule.setPaymentStatus(2);
+ schedule.setPlannedAmount(schedule.getPlannedAmount());
+ contractPaymentScheduleMapper.updateById(schedule);
+ }else {
+ schedule.setPaymentStatus(1);
+ schedule.setPlannedAmount(lastTotal);
+ }
+ }
+
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
@@ -213,6 +225,7 @@
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(newConfim);
+
}
}
@@ -265,6 +278,17 @@
currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(currentConfim);
+ //鏇存柊褰撳墠闃舵浠樻鎯呭喌
+ if (lastTotal.compareTo(new BigDecimal("0"))>0){
+ if (currentConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
+ schedule.setPaymentStatus(2);
+ schedule.setPlannedAmount(schedule.getPlannedAmount());
+ contractPaymentScheduleMapper.updateById(schedule);
+ }else {
+ schedule.setPaymentStatus(1);
+ schedule.setPlannedAmount(lastTotal);
+ }
+ }
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
@@ -302,6 +326,17 @@
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(newConfim);
+ //鏇存柊褰撳墠闃舵浠樻鎯呭喌
+ if (lastNewTotal.compareTo(new BigDecimal("0"))>0){
+ if (newConfim.getTotalAmount().compareTo(new BigDecimal("0"))>=0) {
+ schedule.setPaymentStatus(2);
+ schedule.setPlannedAmount(schedule.getPlannedAmount());
+ contractPaymentScheduleMapper.updateById(schedule);
+ }else {
+ schedule.setPaymentStatus(1);
+ schedule.setPlannedAmount(lastNewTotal);
+ }
+ }
}
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index 5d43f90..fd7e0b9 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -108,7 +108,7 @@
}
if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
schedule.setPaymentStatus(0);
- }else {
+ } else {
schedule.setPaymentStatus(3);
}
schedule.setContractId(contract.getId());
@@ -177,7 +177,7 @@
schedule.setStageOrder(currentIndex);
if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
schedule.setPaymentStatus(0);
- }else {
+ } else {
schedule.setPaymentStatus(3);
}
contractPaymentScheduleMapper.insert(schedule);
@@ -367,26 +367,32 @@
}
}
if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
- BigDecimal currentSum = new BigDecimal("0");
- for (BigDecimal currentAmount : outAmountList
- ) {
- currentSum = currentSum.add(currentAmount);
- //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
- PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
- "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
- inConfirm.setBusinessType("璧勯噾杞叆");
- inConfirm.setConfirmTime(new Date());
- inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
- inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
- if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
- inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
- } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
- inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
- }
- paymentConfirmMapper.insert(inConfirm);
+ BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentInSum);
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ schedule.setActualAmount(inConfirm.getTransationAmount());
+ schedule.setPaymentStatus(2);
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0){
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ schedule.setActualAmount(currentInSum);
+ schedule.setPaymentStatus(1);
}
+ paymentConfirmMapper.insert(inConfirm);
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ contractPaymentScheduleMapper.updateById(schedule);
}
+
+ }else {
+ paymentConfirmMapper.insert(paymentConfirm);
}
}
@@ -395,7 +401,7 @@
List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
.ne(ContractPaymentSchedule::getPaymentStatus, "2")
- .ne(ContractPaymentSchedule::getPaymentStatus,3));
+ .ne(ContractPaymentSchedule::getPaymentStatus, 3));
if (ArrayUtil.isNotEmpty(scheduleList.toArray())) {
scheduleList.stream().forEach(contractPaymentSchedule -> {
Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 9507420..3b5e5e9 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -62,11 +62,11 @@
return R.failed("娌℃湁鏌ヨ鍒扮浉鍏冲悎鍚岃鍗�");
}
List<String> erpCodeList = subjectMatterList.stream().map(ContractSubjectMatter::getMaterialCode).collect(Collectors.toList());
- BigDecimal orderNum = subjectMatterList.stream().filter(item ->item.getDeliveryStatus()!=2)
- .map(item ->item.getDeliveryStatus()==0?item.getQuantity():item.getRemainingQuantity())
+ BigDecimal orderNum = subjectMatterList.stream().filter(item -> item.getDeliveryStatus() != 2)
+ .map(item -> item.getDeliveryStatus() == 0 ? item.getQuantity() : item.getRemainingQuantity())
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal outTotal = addDTO.getSubjectMatterList().stream()
- .filter(item->erpCodeList.contains(item.getSubjectMatterCode()))
+ .filter(item -> erpCodeList.contains(item.getSubjectMatterCode()))
.map(OutSubjectMatterAddDTO::getOutBoundNum)
.filter(num -> num != null) // 杩囨护鎺� null 鍊硷紝闃叉 NullPointerException
.reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -102,7 +102,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ saveContractOutBound(contract, addDTO, subjectMatter, outBound.getId());
} else {
BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
@@ -113,7 +113,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ saveContractOutBound(contract, addDTO, subjectMatter, outBound.getId());
break;
}
@@ -129,7 +129,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ saveContractOutBound(contract, addDTO, subjectMatter, outBound.getId());
} else {
BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
@@ -140,7 +140,7 @@
contractSubjectMatterMapper.updateById(subjectMatter);
currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
//鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ saveContractOutBound(contract, addDTO, subjectMatter, outBound.getId());
break;
}
}
@@ -200,41 +200,41 @@
//鏌ヨ涔嬪墠鎵�鏈夊彂璐у墠搴旀敹
List<PaymentConfirm> fhConfirmList = paymentConfirmMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .eq(PaymentConfirm::getScheduleId,schedule.getId()).orderByDesc(PaymentConfirm::getCreateTime));
- BigDecimal fhTotalAmount = fhConfirmList.stream().map(item->item.getTransationAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ .eq(PaymentConfirm::getScheduleId, schedule.getId()).orderByDesc(PaymentConfirm::getCreateTime));
+ BigDecimal fhTotalAmount = fhConfirmList.stream().map(item -> item.getTransationAmount()).reduce(BigDecimal.ZERO, BigDecimal::add);
//鏈鍙戣揣鍓嶅簲鏀� 鍑哄簱鎬婚 - 鎵�鏈夊彂璐у墠搴旀敹
paymentConfirm.setTransationAmount(paymentConfirm.getTransationAmount().subtract(fhTotalAmount));
paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
- if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(paymentConfirm);
}
} else {
//涓嶅瓨鍦ㄥ彂璐у簲鏀� 鍑哄簱鎬婚
paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
- if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(paymentConfirm);
}
}
} else {
//鏃犱箣鍓嶉樁娈靛簲鏀�
paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
- if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(paymentConfirm);
//瀹㈡埛浠樻瀹屾垚鍚堝悓
List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
.eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
- if (ArrayUtil.isNotEmpty(customerCompleteContractList)){
+ if (ArrayUtil.isNotEmpty(customerCompleteContractList)) {
List<BigDecimal> outAmountList = new ArrayList<>();
- for (Contract completeContract:customerCompleteContractList
+ for (Contract completeContract : customerCompleteContractList
) {
- PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,completeContract.getId())
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
//鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
- if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
//鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
- PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
- "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
outConfirm.setBusinessType("璧勯噾杞嚭");
outConfirm.setConfirmTime(new Date());
outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
@@ -243,25 +243,28 @@
outAmountList.add(outConfirm.getTransationAmount());
}
}
- if (ArrayUtil.isNotEmpty(outAmountList.toArray())){
- BigDecimal currentSum = new BigDecimal("0");
- for (BigDecimal currentAmount:outAmountList
- ) {
- currentSum=currentSum.add(currentAmount);
- //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
- PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
- "advanceAmount","receivableAmount","overdueAmount","totalAmount");
- inConfirm.setBusinessType("璧勯噾杞叆");
- inConfirm.setConfirmTime(new Date());
- inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
- inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
- if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
- inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
- }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
- inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
- }
- paymentConfirmMapper.insert(inConfirm);
+ if (ArrayUtil.isNotEmpty(outAmountList.toArray())) {
+ BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentInSum);
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ schedule.setActualAmount(inConfirm.getTransationAmount());
+ schedule.setPaymentStatus(2);
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0){
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ }else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ schedule.setActualAmount(paymentConfirm.getTotalAmount().subtract(currentInSum));
+ schedule.setPaymentStatus(1);
}
+ paymentConfirmMapper.insert(inConfirm);
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ scheduleMapper.updateById(schedule);
}
}
}
@@ -332,7 +335,7 @@
lastNewTotal = lastNewConfirm.getTotalAmount();
}
newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- if(endSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(newConfim);
}
}
@@ -352,9 +355,9 @@
contract.setNextScheduleName("鏃�");
contractMapper.updateById(contract);
//褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+ if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0) {
//鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
contract.setContractStatus(3);
contractMapper.updateById(contract);
@@ -367,7 +370,7 @@
return R.ok();
}
- private void saveContractOutBound(Contract contract, OutBoundAddDTO addDTO, ContractSubjectMatter subjectMatter,Long outBoundId) {
+ private void saveContractOutBound(Contract contract, OutBoundAddDTO addDTO, ContractSubjectMatter subjectMatter, Long outBoundId) {
ContractOutBound contractOutBound = new ContractOutBound();
contractOutBound.setContractId(contract.getId());
contractOutBound.setContractName(contract.getContractName());
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 851c239..9846cf2 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
@@ -253,19 +253,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);
@@ -281,9 +287,16 @@
entity.setBusGuestName(customer.getCompanyName());
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) {
@@ -371,10 +384,10 @@
// if (payComScheduleList.stream().allMatch(item -> Objects.equals(item.getPaymentStatus(), 2))) {
// contract.setContractStatus(3);
// }
- contractService.updateById(contract);
if (contract.getAmount().compareTo(contract.getPaidAmount()) == 0) {
contract.setBillingStatus("2");
contract.setContractStatus(3);
+ contractService.updateById(contract);
payCompleteContractList.add(contract);
}
//浠樻 涓� 浠樻鏈叏浠�
@@ -385,28 +398,28 @@
});
//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
- 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();
}
@@ -569,7 +582,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");
@@ -601,9 +616,16 @@
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")));
@@ -683,11 +705,17 @@
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);
+ contractService.updateById(contract);
payCompleteContractList.add(contract);
}
//浠樻 涓� 浠樻鏈叏浠�
@@ -698,28 +726,28 @@
});
//瀹㈡埛棰勪粯鏈夊墿浣� 涓� 鏈夐浠樻鐨勫悎鍚�
- 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,SysDept dept) {
--
Gitblit v1.9.1