From b1b3da5393c75ced1afa1467be69d60af5403878 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 27 八月 2026 14:25:16 +0800
Subject: [PATCH] feat:合同审核、出库及履约阶段代码优化
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 614 ++++++++++++++++++++++++-------------------------------
1 files changed, 272 insertions(+), 342 deletions(-)
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 538a5a3..9f3abfb 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
@@ -28,6 +28,8 @@
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
@@ -89,6 +91,7 @@
private final StringRedisTemplate redisTemplate;
private final ContractOutBoundMapper contractOutBoundMapper;
private final RemoteDictService remoteDictService;
+ private final ContractPaymentScheduleProcessService processService;
@Value("${erp.ymj}")
private String ymjErp;
@@ -136,8 +139,9 @@
if (ObjUtil.isNotNull(bc)) {
contract.setPartyA(bc.getCompanyName());
}
- if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())) {
- return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜");
+ if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+ && StrUtil.isEmpty(bc.getCreditCode())) {
+ return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
}
}
@@ -464,209 +468,90 @@
Contract contract = baseMapper.selectById(id);
contract.setContractStatus(2);
baseMapper.updateById(contract);
-
-
+ //姘寸數鎴跨 鎵ц鏃�
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, id));
if (StrUtil.isNotEmpty(contract.getContractCategory()) && StrUtil.equals(contract.getContractCategory(), "water_house")) {
- if (CollUtil.isNotEmpty(subjectMatterList)) {
- for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
- if (StrUtil.equals(contract.getExecFrequency(), "1")) {
- Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
- DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetWeek(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "2")) {
- Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
- DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "3")) {
- Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
- DateUtil.endOfQuarter(contract.getExpirationDate()), true) + 1) / 3;
-
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "4")) {
- Date startDate = contract.getEffectiveDate();
- Date endDate = contract.getExpirationDate();
- Integer startMonth = DateUtil.month(contract.getEffectiveDate());
- Integer endMonth = DateUtil.month(contract.getExpirationDate());
- if (1 <= startMonth && startMonth <= 6) {
- startDate = DateUtil.beginOfYear(startDate);
- }
- if (7 <= startMonth && startMonth <= 12) {
- startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate), 6);
- }
- if (1 <= endMonth && endMonth <= 6) {
- endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
- }
- if (7 <= endMonth && endMonth <= 12) {
- endDate = DateUtil.endOfYear(endDate);
- }
- Long weeksTrue = (DateUtil.betweenMonth(startDate, endDate, true) + 1) / 6;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
- if (StrUtil.equals(contract.getExecFrequency(), "5")) {
- Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
- DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
- //寰幆鏃ユ湡
- Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
- for (int i = 0; i < weeksTrue.intValue(); i++) {
- Date execDatei = DateUtil.offsetWeek(execDate0, i);
- ContractExecDate execDate = new ContractExecDate();
- execDate.setContractId(contract.getId());
- execDate.setMatterId(contractSubjectMatter.getId());
- execDate.setExecDate(execDatei);
- execDate.setGenFlag("0");
- if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
- contractExecDateMapper.insert(execDate);
- }
- }
- }
-
- }
- }
- } else {
- ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
- .orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")) {
- //鏂板搴旀敹
- savePaymentConfirm(contract, fitstSchedule);
-
- //鏂板鍚堝悓灞ョ害璁板綍
- ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
- process.setContractId(contract.getId());
- process.setContractName(contract.getContractName());
- process.setScheduleId(fitstSchedule.getId());
- process.setScheduleName(fitstSchedule.getStageName());
- process.setProcessDate(contract.getSignDate());
- contractPaymentScheduleProcessMapper.insert(process);
-// //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
-// PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
-// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
-// if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
-// //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
-// contract.setContractStatus(3);
-// baseMapper.updateById(contract);
-// }
- } else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- baseMapper.updateById(contract);
- } else if (fitstSchedule.getStageName().equals("璐у埌绛炬敹")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("璐у埌绛炬敹");
- baseMapper.updateById(contract);
- } else if (fitstSchedule.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("璋冭瘯瀹屾垚鎴栭獙鏀�");
- baseMapper.updateById(contract);
- } else {
- //鏂板搴旀敹
- savePaymentConfirm(contract, fitstSchedule);
- }
- //鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
- .eq(ContractPaymentSchedule::getContractId, fitstSchedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, fitstSchedule.getStageOrder())
- .orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (ArrayUtil.isNotEmpty(afterSchedule) && afterSchedule.size() == 1) {
- //鏈�鍚庨樁娈电敓鏁堟椂闂�
- ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
-// endSchedule.setEffectiveEndDate(DateUtil.offsetDay(new Date(),endSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(endSchedule);
- //鏈�鍚庨樁娈靛簲鏀�
- 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(endSchedule.getStageName());
- newConfim.setConfirmTime(new Date());
- 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());
- baseMapper.updateById(contract);
- }
- if (ArrayUtil.isNotEmpty(afterSchedule) && afterSchedule.size() > 1) {
- //绗竴闃舵鐢熸晥鏃堕棿
-// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(fitstSchedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName(afterSchedule.get(0).getStageName());
- baseMapper.updateById(contract);
- }
- //鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
-// if(ArrayUtil.isEmpty(afterSchedule)){
-// fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
-// contractPaymentScheduleMapper.updateById(fitstSchedule);
-// }
+ handleWaterHouseCycle(contract,subjectMatterList);
+ return;
}
+ //璧勯噾鏄庣粏
+ savePaymentConfirm(contract);
+
+ //鍚堝悓鎺ㄩ�佸瓙鍏徃
+ pushSubCompany(contract,subjectMatterList);
+
+ //鍚堝悓涓績鎺ㄩ��
+ pusnContractCenter(contract,subjectMatterList);
+
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ baseMapper.updateById(contract);
+ }
+
+ private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+ new Thread(() -> {
+ try {
+ JSONObject requestApply = new JSONObject();
+ requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
+ requestApply.put("fd_isrelated", "鏄�");
+ requestApply.put("fd_bizId", contract.getId());
+ requestApply.put("fd_remark", contract.getRemark());
+ requestApply.put("fd_MainContent", "");
+ requestApply.put("fd_settlementType", "00");
+ requestApply.put("fd_applyType", "澶栭攢");
+ requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
+ requestApply.put("fd_docNumber", contract.getContractNo());
+ requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+ requestApply.put("fd_name", contract.getContractName());
+ requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
+ requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
+ requestApply.put("fd_contractCreater", contract.getNickName());
+ requestApply.put("fd_currency", "浜烘皯甯�");
+ requestApply.put("fd_ContractAmount", contract.getAmount());
+ requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
+ .multiply(new BigDecimal("87")));
+ requestApply.put("fd_docStatus", "20");
+ requestApply.put("fd_taxRates", 13);
+ requestApply.put("fd_customerName", contract.getPartyA());
+ requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
+ requestApply.put("fd_type", "00");
+ log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+ String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
+ log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
+ JSONObject applyResp = JSONObject.parseObject(respApply);
+ if (applyResp.getString("code").equals("00")) {
+ JSONObject request = new JSONObject();
+ request.put("fd_docNumber", contract.getContractNo());
+ request.put("fd_singer", contract.getNickName());
+ request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
+ request.put("fd_linkPerson", "");
+ request.put("fd_linkPhone", "");
+ request.put("fd_address", contract.getSignPlace());
+ request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("fd_receivedNum", 1);
+ request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
+ request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
+ request.put("fd_reviewerNo", contract.getNickName());
+ request.put("fd_docStatus", "20");
+ request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+ request.put("fd_attName", contract.getAttachmentName());
+ request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+ log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}", request.toJSONString());
+ String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
+ log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
+ JSONObject respJson = JSONObject.parseObject(resp);
+ if (respJson.getString("code").equals("00")) {
+ contract.setCenterPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }).start();
+ }
+
+ private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
//erp鎺ㄩ��
new Thread(() -> {
try {
@@ -803,67 +688,127 @@
e.printStackTrace();
}
}).start();
- //鍚堝悓涓績鎺ㄩ��
- new Thread(() -> {
- try {
- JSONObject requestApply = new JSONObject();
- requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
- requestApply.put("fd_isrelated", "鏄�");
- requestApply.put("fd_bizId", contract.getId());
- requestApply.put("fd_remark", contract.getRemark());
- requestApply.put("fd_MainContent", "");
- requestApply.put("fd_settlementType", "00");
- requestApply.put("fd_applyType", "澶栭攢");
- requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
- requestApply.put("fd_docNumber", contract.getContractNo());
- requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
- requestApply.put("fd_name", contract.getContractName());
- requestApply.put("fd_signDate", DateUtil.formatDate(contract.getSignDate()));
- requestApply.put("fd_endDate", DateUtil.formatDate(contract.getExpirationDate()));
- requestApply.put("fd_contractCreater", contract.getNickName());
- requestApply.put("fd_currency", "浜烘皯甯�");
- requestApply.put("fd_ContractAmount", contract.getAmount());
- requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
- .multiply(new BigDecimal("87")));
- requestApply.put("fd_docStatus", "20");
- requestApply.put("fd_taxRates", 13);
- requestApply.put("fd_customerName", contract.getPartyA());
- requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
- requestApply.put("fd_type", "00");
- log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
- String respApply = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addSupplyContractApply", requestApply.toJSONString());
- log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍥炲弬锛歿}", respApply);
- JSONObject applyResp = JSONObject.parseObject(respApply);
- if (applyResp.getString("code").equals("00")) {
- JSONObject request = new JSONObject();
- request.put("fd_docNumber", contract.getContractNo());
- request.put("fd_singer", contract.getNickName());
- request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
- request.put("fd_linkPerson", "");
- request.put("fd_linkPhone", "");
- request.put("fd_address", contract.getSignPlace());
- request.put("fd_receivedTime", DateUtil.format(contract.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
- request.put("fd_receivedNum", 1);
- request.put("fd_effedate", DateUtil.formatDate(contract.getSignDate()));
- request.put("fd_enddate", DateUtil.formatDate(contract.getExpirationDate()));
- request.put("fd_reviewerNo", contract.getNickName());
- request.put("fd_docStatus", "20");
- request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
- request.put("fd_attName", contract.getAttachmentName());
- request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
- log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}", request.toJSONString());
- String resp = HttpUtil.post("https://oatest.res.jzeg.cn/ekp/api/km-agreement/kmAgreementWebService/addContractReview", request.toJSONString());
- log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍥炲弬锛歿}", resp);
- JSONObject respJson = JSONObject.parseObject(resp);
- if (respJson.getString("code").equals("00")) {
- contract.setCenterPushFlag("1");
- baseMapper.updateById(contract);
+
+ }
+
+ private void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
+ //鏂板鍚堝悓灞ョ害璁板綍
+ ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
+ process.setContractId(contract.getId());
+ process.setContractName(contract.getContractName());
+ process.setScheduleId(schedule.getId());
+ process.setScheduleName(schedule.getStageName());
+ process.setProcessDate(contract.getSignDate());
+ contractPaymentScheduleProcessMapper.insert(process);
+ }
+
+ private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
+ if (StrUtil.equals(contract.getExecFrequency(), "1")) {
+ Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
+ DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetWeek(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
}
}
- } catch (Exception e) {
- e.printStackTrace();
+ if (StrUtil.equals(contract.getExecFrequency(), "2")) {
+ Long weeksTrue = DateUtil.betweenMonth(DateUtil.beginOfMonth(contract.getEffectiveDate()),
+ DateUtil.endOfMonth(contract.getExpirationDate()), true) + 1;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfMonth(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "3")) {
+ Long weeksTrue = (DateUtil.betweenMonth(DateUtil.beginOfQuarter(contract.getEffectiveDate()),
+ DateUtil.endOfQuarter(contract.getExpirationDate()), true) + 1) / 3;
+
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfQuarter(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i * 3);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "4")) {
+ Date startDate = contract.getEffectiveDate();
+ Date endDate = contract.getExpirationDate();
+ Integer startMonth = DateUtil.month(contract.getEffectiveDate());
+ Integer endMonth = DateUtil.month(contract.getExpirationDate());
+ if (1 <= startMonth && startMonth <= 6) {
+ startDate = DateUtil.beginOfYear(startDate);
+ }
+ if (7 <= startMonth && startMonth <= 12) {
+ startDate = DateUtil.offsetMonth(DateUtil.beginOfYear(startDate), 6);
+ }
+ if (1 <= endMonth && endMonth <= 6) {
+ endDate = DateUtil.offsetMonth(DateUtil.endOfYear(endDate), -6);
+ }
+ if (7 <= endMonth && endMonth <= 12) {
+ endDate = DateUtil.endOfYear(endDate);
+ }
+ Long weeksTrue = (DateUtil.betweenMonth(startDate, endDate, true) + 1) / 6;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(startDate, contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetMonth(execDate0, i * 6);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+ if (StrUtil.equals(contract.getExecFrequency(), "5")) {
+ Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfYear(contract.getEffectiveDate()),
+ DateUtil.endOfYear(contract.getExpirationDate()), true) + 1;
+ //寰幆鏃ユ湡
+ Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfYear(contract.getEffectiveDate()), contract.getExecDay());
+ for (int i = 0; i < weeksTrue.intValue(); i++) {
+ Date execDatei = DateUtil.offsetWeek(execDate0, i);
+ ContractExecDate execDate = new ContractExecDate();
+ execDate.setContractId(contract.getId());
+ execDate.setMatterId(contractSubjectMatter.getId());
+ execDate.setExecDate(execDatei);
+ execDate.setGenFlag("0");
+ if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
+ contractExecDateMapper.insert(execDate);
+ }
+ }
+ }
+
}
- }).start();
+ }
}
private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
@@ -874,80 +819,44 @@
erpRequestRecordMapper.insert(record);
}
- private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType(schedule.getStageName() + "搴旀敹");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(schedule.getId());
- paymentConfirm.setScheduleName(schedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- 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();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
- paymentConfirmMapper.insert(paymentConfirm);
- }
- //瀹㈡埛浠樻瀹屾垚鍚堝悓
- List<Contract> customerCompleteContractList = baseMapper.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 (ObjUtil.isNotNull(contractLastConfirm) && 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());
+ private void savePaymentConfirm(Contract contract) {
+ ContractPaymentSchedule fitstSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery()
+ .eq(ContractPaymentSchedule::getContractId, contract.getId())
+ .eq(ContractPaymentSchedule::getStageName,"鍚堝悓绛捐")
+ .last("limit 1"));
+ fitstSchedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+ contractPaymentScheduleMapper.updateById(fitstSchedule);
+ //鎶ラ敊灞ョ害璁板綍
+ saveScheduleProcess(contract,fitstSchedule);
+ //淇濆瓨璧勯噾鏄庣粏
+ if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ //鏂板搴旀敹
+ PaymentConfirm currentConfim = new PaymentConfirm();
+ currentConfim.setBusinessType(fitstSchedule.getStageName() + "搴旀敹");
+ currentConfim.setBusGuestId(contract.getPartyAId());
+ currentConfim.setBusGuestName(contract.getPartyA());
+ currentConfim.setContractId(contract.getId());
+ currentConfim.setContractName(contract.getContractName());
+ currentConfim.setContractNo(contract.getContractNo());
+ currentConfim.setScheduleId(fitstSchedule.getId());
+ currentConfim.setScheduleName(fitstSchedule.getStageName());
+ currentConfim.setConfirmTime(contract.getSignDate());
+ currentConfim.setTransationAmount(fitstSchedule.getPlannedAmount());
+ currentConfim.setReceivableAmount(fitstSchedule.getPlannedAmount());
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (ObjUtil.isNotNull(lastConfirm)) {
+ currentConfim.setTotalAmount(lastConfirm.getTotalAmount().subtract(currentConfim.getTransationAmount()));
+ if (contract.getContractNo().startsWith("ZB-")) {
+ paymentConfirmMapper.insert(currentConfim);
}
+ return;
}
- if (ArrayUtil.isNotEmpty(outAmountList)) {
- 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);
+ currentConfim.setTotalAmount(currentConfim.getTransationAmount().multiply(new BigDecimal("-1")));
+ paymentConfirmMapper.insert(currentConfim);
+ processService.handleBeforeRemain(currentConfim,contract);
}
+
}
@Override
@@ -2524,13 +2433,13 @@
contract.setPartyB(SecurityUtils.getUser().getCompName());
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setContractStatus(2);
- contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0"));
- contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout())?
- contract.getBillingAmout():new BigDecimal("0"));
+ contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0"));
+ contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout()) ?
+ contract.getBillingAmout() : new BigDecimal("0"));
contract.setBillingStatus("1");
baseMapper.insert(contract);
- BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount())?contract.getPaidAmount():new BigDecimal("0");
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
StrUtil.isNotBlank(item.getMaterialCode()) &&
StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
@@ -2544,7 +2453,28 @@
subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
contractSubjectMatterMapper.insert(subjectMatter);
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+ //鍑哄簱鍗�
+ ContractOutBound outBound = new ContractOutBound();
+ outBound.setBusGuestId(contract.getPartyAId());
+ outBound.setBusGuestName(contract.getPartyA());
+ outBound.setContractId(contract.getId());
+ outBound.setContractName(contract.getContractName());
+ outBound.setInvoiceNum(new BigDecimal("0"));
+ outBound.setInvoiceStatus("0");
+ outBound.setOutBoundTime(new Date());
+ outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
+ outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+ outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
+ contractOutBoundMapper.insert(outBound);
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
+ contract.setBillingStatus("2");
+ baseMapper.updateById(contract);
+ }
+ }
+
}
}
List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
@@ -2563,20 +2493,20 @@
.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
schedule.setPaymentStatus(0);
schedule.setStageOrder(j + 1);
- if (remainAmount.compareTo(new BigDecimal("0"))>0&&schedule.getPlannedAmount().compareTo(new BigDecimal("0"))>0){
+ if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
- if (remainAmount.compareTo(new BigDecimal("0"))>=0){
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
schedule.setPaymentStatus(2);
schedule.setActualAmount(schedule.getPlannedAmount());
}
- if (remainAmount.compareTo(new BigDecimal("0"))<0){
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
schedule.setPaymentStatus(1);
schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
}
}
contractPaymentScheduleMapper.insert(schedule);
- if (schedule.getStageName().equals("璐ㄤ繚閲�")&&contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0")).compareTo(new BigDecimal("0"))>0){
+ if (schedule.getStageName().equals("璐ㄤ繚閲�") && contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")).compareTo(new BigDecimal("0")) > 0) {
PaymentConfirm confirm = new PaymentConfirm();
confirm.setBusGuestId(contract.getPartyAId());
confirm.setBusGuestName(contract.getPartyA());
@@ -2587,8 +2517,8 @@
confirm.setContractNo(contract.getContractNo());
confirm.setScheduleId(schedule.getId());
confirm.setScheduleName(schedule.getStageName());
- confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0")));
+ confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")));
confirm.setReceivableAmount(confirm.getTransationAmount());
confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
paymentConfirmMapper.insert(confirm);
--
Gitblit v1.9.1