From a422a984cfa2a5a2bbe89c6fa6947363e559bb4f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 22 五月 2026 09:29:14 +0800
Subject: [PATCH] feat:faet:出库加批次号，合同履约加销方购方履约，到货单据必填校验，验收单据必填校验，单位新增法人、委托代理人字段 、合同出库新增erp出库ID
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 447 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 328 insertions(+), 119 deletions(-)
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 be9ffc8..f722306 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
@@ -14,13 +14,14 @@
import com.by4cloud.platformx.business.vo.ContractPaymentScheduleVo;
import com.by4cloud.platformx.business.vo.ScheduleProcessVo;
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 org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 灞ョ害鑺傜偣
@@ -33,166 +34,374 @@
public class ContractPaymentScheduleProcessServiceImpl extends ServiceImpl<ContractPaymentScheduleProcessMapper, ContractPaymentScheduleProcess> implements ContractPaymentScheduleProcessService {
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
- private final ContractPaymentScheduleProcessMapper processMapper;
private final ContractMapper contractMapper;
private final ContractSubjectMatterMapper subjectMatterMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
+ private final ContractOutBoundMapper contractOutBoundMapper;
@Override
public R add(ContractPaymentScheduleProcessAddDTO addDTO) {
ContractPaymentSchedule schedule = contractPaymentScheduleMapper.selectById(addDTO.getScheduleId());
- if (ObjUtil.isNull(schedule)){
+ if (ObjUtil.isNull(schedule)) {
return R.failed("灞ョ害闃舵涓庡悎鍚屼笉涓�鑷达紝璇疯仈绯绘妧鏈汉鍛�");
+ }
+ if (schedule.getStageName().equals("璐у埌绛炬敹") && ArrayUtil.isEmpty(addDTO.getContractOutBoundIds().toArray())) {
+ return R.failed("璇烽�夋嫨鍒拌揣鐨勫嚭搴撲俊鎭�");
}
//鍚堝悓
Contract contract = contractMapper.selectById(schedule.getContractId());
- List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
- if (ArrayUtil.isEmpty(subjectMatterList.toArray())){
+ List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
+ if (ArrayUtil.isEmpty(subjectMatterList.toArray())) {
return R.failed("璇ュ悎鍚屾爣鐨勭墿寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
}
- if (!subjectMatterList.stream().allMatch(item->item.getDeliveryStatus()==2)){
- return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+// if (!subjectMatterList.stream().allMatch(item -> item.getDeliveryStatus() == 2)) {
+// return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+// }
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ //鏇存柊鍚堝悓鍑哄簱鍒拌揣鏃堕棿
+ addDTO.getContractOutBoundIds().forEach(contractOutBoundId -> {
+ ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundId);
+ contractOutBound.setArrivalTime(addDTO.getProcessDate());
+ contractOutBound.setArrivalAttNames(addDTO.getOutBoundAttNames());
+ contractOutBound.setArrivalAttPaths(addDTO.getOutBoundAttPaths());
+ contractOutBoundMapper.updateById(contractOutBound);
+ });
}
- //鏂板褰撳墠闃舵搴旀敹
- PaymentConfirm currentConfim = new PaymentConfirm();
- currentConfim.setBusinessType(schedule.getStageName()+"搴旀敹");
- currentConfim.setBusGuestId(contract.getPartyAId());
- currentConfim.setBusGuestName(contract.getPartyA());
- currentConfim.setContractId(contract.getId());
- currentConfim.setContractName(contract.getContractName());
- currentConfim.setContractNo(contract.getContractNo());
- currentConfim.setScheduleId(schedule.getId());
- currentConfim.setScheduleName(schedule.getStageName());
- currentConfim.setConfirmTime(addDTO.getProcessDate());
- currentConfim.setTransationAmount(schedule.getPlannedAmount());
- currentConfim.setReceivableAmount(schedule.getPlannedAmount());
- PaymentConfirm lastConfirm = paymentConfirmMapper.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();
- }
- currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(currentConfim);
//灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO,ContractPaymentScheduleProcess.class);
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = BeanUtil.copyProperties(addDTO, ContractPaymentScheduleProcess.class);
contractPaymentScheduleProcess.setContractId(schedule.getContractId());
contractPaymentScheduleProcess.setContractName(schedule.getContractName());
contractPaymentScheduleProcess.setScheduleId(schedule.getId());
contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- baseMapper.insert(contractPaymentScheduleProcess);
+ ContractPaymentScheduleProcess lastProcess = baseMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery().eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+ .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+ if (ObjUtil.isNull(lastProcess)) {
+ baseMapper.insert(contractPaymentScheduleProcess);
+ }
+
//鏇存柊褰撳墠闃舵
- if (ObjUtil.isNull(schedule.getEffectiveDate())) {
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(),schedule.getAgreedDays()));
+ if (ObjUtil.isNull(schedule.getEffectiveDate()) && ObjUtil.isNull(schedule.getEffectiveEndDate())) {
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
contractPaymentScheduleMapper.updateById(schedule);
}
+
//鏌ヨ鏄惁鏈変箣鍓嶉樁娈�
ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(beforeSchedule)){
+ if (ObjUtil.isNotNull(beforeSchedule) && ObjUtil.isNull(beforeSchedule.getEffectiveEndDate())) {
beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
contractPaymentScheduleMapper.updateById(beforeSchedule);
- //涔嬪墠闃舵鏄惁鏀舵瀹屾垚
-// if (beforeSchedule.getPaymentStatus()!=2){
-// //鏂板涔嬪墠闃舵瓒呮湡
-// PaymentConfirm beforeConfim = new PaymentConfirm();
-// beforeConfim.setBusinessType("搴旀敹瓒呮湡");
-// beforeConfim.setBusGuestId(contract.getPartyAId());
-// beforeConfim.setBusGuestName(contract.getPartyA());
-// beforeConfim.setContractId(contract.getId());
-// beforeConfim.setContractName(contract.getContractName());
-// beforeConfim.setContractNo(contract.getContractNo());
-// beforeConfim.setScheduleId(schedule.getId());
-// beforeConfim.setScheduleName(schedule.getStageName());
-// beforeConfim.setConfirmTime(addDTO.getProcessDate());
-// beforeConfim.setTransationAmount(schedule.getPlannedAmount());
-// PaymentConfirm newLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-// beforeConfim.setOverdueAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?
-// schedule.getPlannedAmount():
-// schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
-// beforeConfim.setTotalAmount(newLastConfirm.getTotalAmount());
-// paymentConfirmMapper.insert(beforeConfim);
-// }
+ }
- }
- //鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
- //鏈�鍚庨樁娈电敓鏁堟椂闂�
- ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(),"璐ㄤ繚閲�")) {
- endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
- endSchedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(endSchedule);
- //褰撳墠闃舵鐢熸晥鏃堕棿
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
- schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏈�鍚庨樁娈靛簲鏀�
- PaymentConfirm newConfim = new PaymentConfirm();
- newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
- newConfim.setBusGuestId(contract.getPartyAId());
- newConfim.setBusGuestName(contract.getPartyA());
- newConfim.setContractId(contract.getId());
- newConfim.setContractName(contract.getContractName());
- newConfim.setContractNo(contract.getContractNo());
- newConfim.setScheduleId(endSchedule.getId());
- newConfim.setScheduleName(schedule.getStageName());
- newConfim.setConfirmTime(addDTO.getProcessDate());
- newConfim.setTransationAmount(endSchedule.getPlannedAmount());
- newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if (ObjUtil.isNotNull(lastNewConfirm)) {
- lastNewTotal = lastNewConfirm.getTotalAmount();
+ List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery().eq(ContractOutBound::getContractId, contract.getId())
+ .isNotNull(ContractOutBound::getArrivalTime));
+ if (schedule.getStageName().equals("璐у埌绛炬敹")) {
+ if (ArrayUtil.isNotEmpty(contractOutBoundList.toArray())
+ && ArrayUtil.isNotEmpty(subjectMatterList.toArray())) {
+ Map<String, BigDecimal> sumMap = contractOutBoundList.stream()
+ .collect(Collectors.groupingBy(
+ ContractOutBound::getSubjectMatterCode,
+ Collectors.reducing(
+ BigDecimal.ZERO,
+ ContractOutBound::getOutBoundNum,
+ BigDecimal::add
+ )
+ ));
+ Boolean outFlag = checkQuantityEquality(subjectMatterList, sumMap);
+ //鍑哄簱鍒拌揣涓庡悎鍚屾爣鐨勭墿绉嶇被鏁伴噺涓�鑷�
+ if (outFlag) {
+ //鏂板褰撳墠闃舵搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(schedule.getId());
+ currentConfim.setScheduleName(schedule.getStageName());
+ currentConfim.setConfirmTime(addDTO.getProcessDate());
+ currentConfim.setTransationAmount(schedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(schedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.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 {
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ 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)){
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract:customerCompleteContractList
+ ) {
+ 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){
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ 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(lastConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(lastConfirm.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);
+ }
+ }
+ }
+ }
+ currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(currentConfim);
+ }
+
+ //鏌ヨ鏄惁鏈夊悗缁樁娈�
+ List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
+ //鏈�鍚庨樁娈电敓鏁堟椂闂�
+ ContractPaymentSchedule endSchedule = afterSchedule.get(0);
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+ endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
+ endSchedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(endSchedule);
+ //褰撳墠闃舵鐢熸晥鏃堕棿
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏈�鍚庨樁娈靛簲鏀�
+ PaymentConfirm newConfim = new PaymentConfirm();
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
+ newConfim.setBusGuestId(contract.getPartyAId());
+ newConfim.setBusGuestName(contract.getPartyA());
+ newConfim.setContractId(contract.getId());
+ newConfim.setContractName(contract.getContractName());
+ newConfim.setContractNo(contract.getContractNo());
+ newConfim.setScheduleId(endSchedule.getId());
+ newConfim.setScheduleName(schedule.getStageName());
+ newConfim.setConfirmTime(addDTO.getProcessDate());
+ newConfim.setTransationAmount(endSchedule.getPlannedAmount());
+ newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
+
+ }
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(endSchedule.getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
+ schedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName("鏃�");
+ contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ 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) {
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
+ }
}
- newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
}
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(endSchedule.getStageName());
- contractMapper.updateById(contract);
- }
- if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(afterSchedule.get(0).getStageName());
- contractMapper.updateById(contract);
- }
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
- schedule.setEffectiveEndDate(contract.getExpirationDate());
- contractPaymentScheduleMapper.updateById(schedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- contractMapper.updateById(contract);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ } else {
+ //鏂板褰撳墠闃舵搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(schedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(schedule.getId());
+ currentConfim.setScheduleName(schedule.getStageName());
+ currentConfim.setConfirmTime(addDTO.getProcessDate());
+ currentConfim.setTransationAmount(schedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(schedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
+ BigDecimal lastTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ lastTotal = lastConfirm.getTotalAmount();
+ }
+ currentConfim.setTotalAmount(lastTotal.subtract(currentConfim.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(currentConfim);
+ }
+
+ //鏌ヨ鏄惁鏈夊悗缁樁娈�
+ List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
+ //鏈�鍚庨樁娈电敓鏁堟椂闂�
+ ContractPaymentSchedule endSchedule = afterSchedule.get(0);
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+ endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), endSchedule.getAgreedDays()));
+ endSchedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(endSchedule);
+ //褰撳墠闃舵鐢熸晥鏃堕棿
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getProcessDate(), schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏈�鍚庨樁娈靛簲鏀�
+ PaymentConfirm newConfim = new PaymentConfirm();
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
+ newConfim.setBusGuestId(contract.getPartyAId());
+ newConfim.setBusGuestName(contract.getPartyA());
+ newConfim.setContractId(contract.getId());
+ newConfim.setContractName(contract.getContractName());
+ newConfim.setContractNo(contract.getContractNo());
+ newConfim.setScheduleId(endSchedule.getId());
+ newConfim.setScheduleName(schedule.getStageName());
+ newConfim.setConfirmTime(addDTO.getProcessDate());
+ newConfim.setTransationAmount(endSchedule.getPlannedAmount());
+ newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
+ if (endSchedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
+
+ }
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(endSchedule.getStageName());
contractMapper.updateById(contract);
}
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
+ schedule.setEffectiveEndDate(contract.getExpirationDate());
+ contractPaymentScheduleMapper.updateById(schedule);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName("鏃�");
+ contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ 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) {
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
+ }
}
+
+
return R.ok();
+ }
+
+ public boolean checkQuantityEquality(List<ContractSubjectMatter> subjectMatterList, Map<String, BigDecimal> materialCodeMap) {
+ // 1. 鍩烘湰鏍￠獙
+ if (subjectMatterList == null || materialCodeMap == null) {
+ return false;
+ }
+
+ // 濡傛灉瑕佹眰涓よ�呭寘鍚殑鐗╂枡浠ｇ爜瀹屽叏涓�鑷翠笖鏁伴噺涓�鑷达紝鍏堟瘮杈� Key 鐨勬暟閲�
+ // 鎻愬彇 List 涓潪绌虹殑 materialCode
+ List<String> listCodes = subjectMatterList.stream()
+ .map(ContractSubjectMatter::getMaterialCode)
+ .filter(Objects::nonNull)
+ .distinct()
+ .sorted()
+ .collect(Collectors.toList());
+
+ List<String> mapKeys = materialCodeMap.keySet().stream()
+ .sorted()
+ .collect(Collectors.toList());
+
+ // 濡傛灉鐗╂枡缂栫爜闆嗗悎涓嶄竴鑷达紝鐩存帴杩斿洖 false
+ if (!listCodes.equals(mapKeys)) {
+ return false;
+ }
+
+ // 2. 閫愪釜姣旇緝鏁伴噺
+ // 鍋囪 ContractSubjectMatter 涓湁 getQuantity() 鏂规硶杩斿洖 BigDecimal 鎴� Number
+ for (ContractSubjectMatter item : subjectMatterList) {
+ String code = item.getMaterialCode();
+ if (code == null) continue;
+
+ BigDecimal mapValue = materialCodeMap.get(code);
+ BigDecimal listValue = item.getQuantity(); // 鍋囪杩欐槸 List 涓唬琛ㄦ暟閲忕殑瀛楁
+
+ // 澶勭悊 null 鎯呭喌
+ if (mapValue == null && listValue == null) {
+ continue; // 閮戒负绌鸿涓虹浉绛夛紝鎴栨牴鎹笟鍔″畾涓轰笉绛�
+ }
+ if (mapValue == null || listValue == null) {
+ return false; // 涓�涓负绌轰竴涓笉涓虹┖锛屼笉绛�
+ }
+
+ // 浣跨敤 compareTo 姣旇緝 BigDecimal 鍊硷紝0 琛ㄧず鐩哥瓑
+ if (listValue.compareTo(mapValue) != 0) {
+ return false; // 鍙戠幇涓嶇浉绛夛紝绔嬪嵆杩斿洖
+ }
+ }
+
+ return true; // 鎵�鏈夊尮閰嶉」鏁伴噺鍧囩浉绛�
}
@Override
public R selectScheduleProcess(Long id) {
MPJLambdaWrapper<ContractPaymentSchedule> wrapper = new MPJLambdaWrapper<ContractPaymentSchedule>()
- .select(ContractPaymentSchedule::getId,ContractPaymentSchedule::getStageName,ContractPaymentSchedule::getEffectiveDate,
- ContractPaymentSchedule::getPlannedAmount,ContractPaymentSchedule::getPlannedAmount,
- ContractPaymentSchedule::getEffectiveEndDate,ContractPaymentSchedule::getPaymentDate,
- ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount,
+ .select(ContractPaymentSchedule::getId, ContractPaymentSchedule::getStageName, ContractPaymentSchedule::getEffectiveDate,
+ ContractPaymentSchedule::getPlannedAmount, ContractPaymentSchedule::getPlannedAmount,
+ ContractPaymentSchedule::getEffectiveEndDate, ContractPaymentSchedule::getPaymentDate,
+ ContractPaymentSchedule::getPaymentStatus, ContractPaymentSchedule::getActualAmount,
ContractPaymentSchedule::getAgreedDays)
.select(ContractPaymentScheduleProcess::getProcessDate)
- .leftJoin(ContractPaymentScheduleProcess.class,ContractPaymentScheduleProcess::getScheduleId,ContractPaymentSchedule::getId)
- .eq(ContractPaymentSchedule::getContractId,id)
+ .leftJoin(ContractPaymentScheduleProcess.class, ContractPaymentScheduleProcess::getScheduleId, ContractPaymentSchedule::getId)
+ .eq(ContractPaymentSchedule::getContractId, id)
.orderByAsc(ContractPaymentSchedule::getCreateTime);
- List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class,wrapper);
+ List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class, wrapper);
return R.ok(scheduleVoList);
}
}
\ No newline at end of file
--
Gitblit v1.9.1