From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 30 九月 2026 16:12:49 +0800
Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 1780 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 1,279 insertions(+), 501 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..3add066 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
@@ -5,7 +5,6 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
@@ -28,6 +27,7 @@
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.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
@@ -47,6 +47,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ClassPathResource;
import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -89,12 +90,21 @@
private final StringRedisTemplate redisTemplate;
private final ContractOutBoundMapper contractOutBoundMapper;
private final RemoteDictService remoteDictService;
+ private final ContractPaymentScheduleProcessService processService;
+ private final ContractSubjectMatterChangeMapper changeMapper;
+ private final ContractApprovalMapper contractApprovalMapper;
@Value("${erp.ymj}")
private String ymjErp;
@Value("${erp.smj}")
private String smjErp;
+
+ @Value("${erp.smjsc}")
+ private String smjscErp;
+
+ @Value("${erp.smjzt}")
+ private String smjztErp;
@Value("${erp.sgb}")
private String sgbErp;
@@ -114,6 +124,9 @@
@Value("${dept.smjzt}")
private String smjzt;
+ @Value("${dept.smjhw}")
+ private String smjhw;
+
@Value("${dept.sgb}")
private String sgb;
@@ -126,6 +139,21 @@
@Value("${dept.ymj}")
private String ymj;
+ @Value("${tmp.smj}")
+ private String tempSMJ;
+
+ @Value("${tmp.sgb}")
+ private String tempSGB;
+
+ @Value("${tmp.jxc}")
+ private String tempJXC;
+
+ @Value("${tmp.tfgs}")
+ private String tempTFGS;
+
+ @Value("${tmp.ymj}")
+ private String tempYMJ;
+
@Override
public R add(ContractAddDTO addDTO) {
Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
@@ -136,8 +164,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缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
}
}
@@ -175,7 +204,8 @@
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
contract.setContractNo(generateSMJContractNo());
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -299,7 +329,8 @@
contract.setBillingAmout(new BigDecimal("0"));
contract.setNickName(SecurityUtils.getUser().getNickname());
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
contract.setContractNo(generateSMJContractNo());
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -431,30 +462,178 @@
detailVo.setPaymentSlip(slipList);
}
BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+
+ ContractInvoiceBipVo bipVo = new ContractInvoiceBipVo();
+ bipVo.setDjrq(DateUtil.today());
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ if (r.isOk()) {
+ bipVo.setKpzz(r.getData().getBipCode());
+ }
+
if (ObjUtil.isNotNull(customer)) {
detailVo.setInvoiceType(customer.getInvoiceType());
+ bipVo.setYwzz(r.getData().getBipCode());
}
+ R<SysDept> rDept = remoteDeptService.getById(SecurityUtils.getUser().getDeptId());
+ if (rDept.isOk()) {
+ bipVo.setBm(rDept.getData().getOrgCode());
+ bipVo.setHsdy(rDept.getData().getOrgCode());
+ }
+ bipVo.setYwy(SecurityUtils.getUser().getNickname());
+ bipVo.setPzzdr(SecurityUtils.getUser().getNickname());
+ bipVo.setJylx("ZBYXGLXT");
+ bipVo.setWldxlx("1");
+ bipVo.setKh(customer.getCreditCode());
+ bipVo.setBz("浜烘皯甯�");
+ bipVo.setFjzs("1");
+ bipVo.setSfzy("鏄�");
+ bipVo.setSfnbwl("鏄�");
+ bipVo.setSfjyjs("鍚�");
+ bipVo.setDjfx("1");
+ detailVo.setBipVo(bipVo);
return detailVo;
}
@Override
public R startApproval(Long id) {
+
Contract contract = baseMapper.selectById(id);
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("瀹㈡埛鏌ヨ寮傚父");
+ }
+
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ return R.failed("淇℃伅鏌ヨ寮傚父");
+ }
+ SysDept comp = r.getData();
//绠�鏄撳悎鍚屾棤娉曠户缁悗缁搷浣�
if (StrUtil.equals(contract.getContractCategory(), "simple")) {
return R.failed("璇疯ˉ鍏呮爣鐨勭墿鍜屾敹娆鹃樁娈靛悗鍐嶈繘琛屾搷浣滐紒");
}
-
- //鍚姩娴佺▼
- ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
- Map<String, Object> map = BeanUtil.beanToMap(contract);
- dto.setParamMap(map);
- dto.setFlowName(FlowNameEnum.鍚堝悓瀹℃壒.name());
- R r1 = remoteFlowProcessService.startProcessInstance(dto);
- if (r1.getCode() == 1) {
- return R.failed("娴佺▼鍚姩澶辫触");
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().
+ eq(ContractSubjectMatter::getContractId,contract.getId()));
+ //鍚堝悓涓績瀹℃牳
+ JSONObject requestApply = new JSONObject();
+ requestApply.put("fd_selectionmethod", contract.getSelectionMethod());
+ requestApply.put("fd_isrelated", contract.getIsRelated());
+ 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", "澶栭攢");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ requestApply.put("fd_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
}
+ requestApply.put("fd_docNumber", contract.getContractNo());
+// requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+ requestApply.put("fd_templateId", tempSMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+ requestApply.put("fd_templateId", tempSGB);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+ requestApply.put("fd_templateId", tempYMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+ requestApply.put("fd_templateId", tempTFGS);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+ requestApply.put("fd_templateId", tempJXC);
+ }
+ 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", SecurityUtils.getUser().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", "10");
+ requestApply.put("fd_taxRates", 13);
+ requestApply.put("fd_customerName", contract.getPartyA());
+ requestApply.put("fd_systemSource", "闈炵叅閿�鍞郴缁�");
+ requestApply.put("fd_type", "00");
+ requestApply.put("fd_baozhangren", comp.getBaozhangren());
+ requestApply.put("fd_summary",contract.getSummary());
+ JSONArray signList = new JSONArray();
+ JSONObject j = new JSONObject();
+ j.put("fd_standing","鐢�");
+ j.put("fd_Iden",customer.getCreditCode());
+ j.put("fd_signMain","2");
+ signList.add(j);
+ JSONObject y = new JSONObject();
+ y.put("fd_standing","涔�");
+ y.put("fd_Iden",comp.getOrgCode());
+ y.put("fd_signMain","1");
+ signList.add(y);
+ requestApply.put("fd_signList", signList);
+ if (StrUtil.isNotBlank(contract.getAttachmentUrl())) {
+ JSONArray attList = new JSONArray();
+ JSONObject att = new JSONObject();
+ att.put("fd_attNum", "1");
+ att.put("fd_attName", contract.getAttachmentName());
+ att.put("fd_attType", contract.getAttachmentName().substring(contract.getAttachmentName().lastIndexOf('.')+1));
+ att.put("fd_attQuality", "00");
+ att.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+ attList.add(att);
+ requestApply.put("attList", attList);
+ }
+ if (CollUtil.isNotEmpty(subjectMatterList)){
+ JSONArray materialList = new JSONArray();
+ subjectMatterList.stream().forEach(subjectMatter->{
+ JSONObject material = new JSONObject();
+ material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+ material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+ material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+ material.put("fd_figureNumber", "");
+ material.put("fd_measureUnit", subjectMatter.getUnit());
+ material.put("fd_number", subjectMatter.getQuantity());
+ material.put("fd_price", subjectMatter.getUnitPrice());
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+ if (ObjUtil.isNotNull(product)){
+ material.put("fd_rate", product.getTaxRate().toString());
+ }
+ material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+ material.put("fd_requirements", "");
+ material.put("fd_standard", "");
+ material.put("fd_factory", "");
+ material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+ material.put("fd_delivery", "");
+ material.put("fd_des", "");
+ materialList.add(material);
+ });
+ requestApply.put("materialList", materialList);
+ }
+ log.info("鍚堝悓涓績鍚堝悓璧疯崏鎺ュ彛鍏ュ弬锛歿}", requestApply.toJSONString());
+ String respApply = HttpUtil.post("https://oa.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")){
+ return R.failed("鍚堝悓涓績鎺ㄩ�佸鏍稿け璐ワ紝鍘熷洜涓�:{}",applyResp.getString("msg"));
+ }
+ //鍚姩娴佺▼-绯荤粺鑷甫瀹℃壒娴�
+// ProcessInstanceParamDto dto = new ProcessInstanceParamDto();
+// Map<String, Object> map = BeanUtil.beanToMap(contract);
+// dto.setParamMap(map);
+// dto.setFlowName(FlowNameEnum.鍚堝悓瀹℃壒.name());
+// R r1 = remoteFlowProcessService.startProcessInstance(dto);
+// if (r1.getCode() == 1) {
+// return R.failed("娴佺▼鍚姩澶辫触");
+// }
+
+ //宸ヤ笟娉典笉鐢ㄥ鏍� 鐩存帴閫氳繃
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+ contract.setContractStatus(2);
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+
contract.setContractStatus(1);
baseMapper.updateById(contract);
return R.ok();
@@ -464,346 +643,27 @@
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;
}
- //erp鎺ㄩ��
- new Thread(() -> {
- try {
- Thread.sleep(500);
- JSONObject request = new JSONObject();
- BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
- request.put("contractNo", contract.getContractNo());
- request.put("partyA", contract.getPartyA());
- request.put("partyACode", customer.getErpCompanyCode());
- if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
- request.put("customerCode", customer.getErpCompanyCode());
- request.put("currencyId", "RMB");
- request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
- request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
- request.put("moneySum", contract.getAmount());
- request.put("signManner", "闈㈢");
- request.put("salesman", "");
- if (ArrayUtil.isNotEmpty(subjectMatterList)) {
- JSONArray subjectMatter = new JSONArray();
- subjectMatterList.stream().forEach(contractSubjectMatter -> {
- JSONObject subjectMatterItem = new JSONObject();
- subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
- subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
- subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
- subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
- .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
- if (ObjUtil.isNotNull(product)) {
- subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
- }
- subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
- DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
- DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
- subjectMatter.add(subjectMatterItem);
- });
- request.put("details", subjectMatter);
- }
+ //璧勯噾鏄庣粏
+ savePaymentConfirm(contract);
- JSONObject loginJson = new JSONObject();
- loginJson.put("username", "admin");
- loginJson.put("password", "admin123");
- log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
- String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
- log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
- JSONObject respJson = JSONObject.parseObject(loginResp);
- if (respJson.getInteger("code") == 0) {
- JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
- log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
- HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
- .header("token", dataJson.getString("token")) // 娣诲姞璁よ瘉澶�
- .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
- .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
- .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
- log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
- //淇濆瓨璇锋眰璁板綍
- saveErpRequestRecord("ymj", request.toJSONString(), response.body());
- //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
- contract.setErpPushFlag("1");
- baseMapper.updateById(contract);
- }
+ //鍚堝悓鎺ㄩ�佸瓙鍏徃
+ pushSubCompany(contract,subjectMatterList);
- }
- if ((StrUtil.equals(contract.getPartyBId() + "", smj) || StrUtil.equals(contract.getPartyBId() + "", smjsc) ||
- StrUtil.equals(contract.getPartyBId() + "", smjzt)) && StrUtil.isNotEmpty(smjErp)) {
- request.put("customerCode", customer.getErpCompanyCode());
- request.put("currencyId", "RMB");
- request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
- request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
- request.put("moneySum", contract.getAmount());
- request.put("signManner", "闈㈢");
- request.put("salesman", "");
- if (ArrayUtil.isNotEmpty(subjectMatterList)) {
- JSONArray subjectMatter = new JSONArray();
- subjectMatterList.stream().forEach(contractSubjectMatter -> {
- JSONObject subjectMatterItem = new JSONObject();
- subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
- subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
- subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
- subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
- .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
- if (ObjUtil.isNotNull(product)) {
- subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
- }
- subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
- DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
- DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
- subjectMatter.add(subjectMatterItem);
- });
- request.put("details", subjectMatter);
- }
-
- JSONObject loginJson = new JSONObject();
- loginJson.put("username", "admin");
- loginJson.put("password", "Zimafold@2026");
- log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
- String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
- log.info("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
- JSONObject respJson = JSONObject.parseObject(loginResp);
- if (respJson.getInteger("code") == 0) {
- JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
- log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
- HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails")
- .header("token", dataJson.getString("token")) // 娣诲姞璁よ瘉澶�
- .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
- .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
- .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
- log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
- //淇濆瓨璇锋眰璁板綍
- saveErpRequestRecord("smj", request.toJSONString(), response.body());
- //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
- contract.setErpPushFlag("1");
- baseMapper.updateById(contract);
- }
- }
-
- if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
- log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
- String result = HttpUtil.post(jxcErp, request.toJSONString());
- log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
- //淇濆瓨璇锋眰璁板綍
- saveErpRequestRecord("jxc", request.toJSONString(), result);
- //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
- contract.setErpPushFlag("1");
- baseMapper.updateById(contract);
- }
- if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
- //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
- }
- if (StrUtil.equals(contract.getPartyBId() + "", sgb) && StrUtil.isNotEmpty(sgbErp)) {
- //鐭冲伐娉典富鍔ㄦ帹閫佺郴缁�
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }).start();
//鍚堝悓涓績鎺ㄩ��
+// pusnContractCenter(contract,subjectMatterList);
+
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ baseMapper.updateById(contract);
+ }
+
+ private void pusnContractCenter(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
new Thread(() -> {
try {
JSONObject requestApply = new JSONObject();
@@ -814,7 +674,7 @@
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_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());
@@ -846,7 +706,7 @@
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_reviewerNo", SecurityUtils.getUser().getNickname());
request.put("fd_docStatus", "20");
request.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
request.put("fd_attName", contract.getAttachmentName());
@@ -866,6 +726,412 @@
}).start();
}
+ private void pushSubCompany(Contract contract,List<ContractSubjectMatter> subjectMatterList) {
+ //erp鎺ㄩ��
+ new Thread(() -> {
+ try {
+ Thread.sleep(500);
+ JSONObject request = new JSONObject();
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ request.put("contractNo", contract.getContractNo());
+ request.put("partyA", contract.getPartyA());
+ request.put("partyACode", customer.getErpCompanyCode());
+ if (StrUtil.equals(contract.getPartyBId() + "", ymj) && StrUtil.isNotEmpty(ymjErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+ String token = "";
+ if (redisTemplate.hasKey("YMJ_ERP_TOKEN")) {
+ token = (String) redisTemplate.opsForValue().get("YMJ_ERP_TOKEN");
+ } else {
+ token = getYmjErpToken();
+ }
+ if (StrUtil.isEmpty(token)){
+ log.error("涓�鐓ゆ満鐧诲綍鑾峰彇token澶辫触");
+ return;
+ }
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+ HttpResponse response = HttpRequest.post(ymjErp + "/api/contract-staging/v1/receive")
+ .header("token", token) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("ymj", request.toJSONString(), response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+
+ }
+ if ((StrUtil.equals(contract.getPartyBId() + "", smj) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) && StrUtil.isNotEmpty(smjErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ request.put("tenantId", "tenant1");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+
+
+ String token = "";
+ if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+ token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+ } else {
+ token = getErpToken();
+ }
+ if (StrUtil.isEmpty(token)){
+ log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+ return;
+ }
+
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+ HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant1")
+ .header("token", token) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("鐭崇叅鏈哄悎鍚屾帹閫乪rp鍥炲弬锛歿}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("smj", request.toJSONString(), response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", smjsc) && StrUtil.isNotEmpty(smjscErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ request.put("tenantId", "tenant2");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+
+ String token = "";
+ if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+ token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+ } else {
+ token = getErpToken();
+ }
+ if (StrUtil.isEmpty(token)){
+ log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+ return;
+ }
+
+ log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+ HttpResponse response = HttpRequest.post(smjErp + "/api/contract/v1/createWithDetails?tenantId=tenant2")
+ .header("token", token) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("鐭崇叅鏈洪殢杞﹀垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("smj", request.toJSONString(), response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", smjzt) && StrUtil.isNotEmpty(smjztErp)) {
+ request.put("customerCode", customer.getErpCompanyCode());
+ request.put("currencyId", "RMB");
+ request.put("signDate", DateUtil.format(contract.getSignDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("dateDeliver", DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ request.put("moneySum", contract.getAmount());
+ request.put("signManner", "闈㈢");
+ request.put("salesman", "");
+ request.put("tenantId", "tenant3");
+ if (CollUtil.isNotEmpty(subjectMatterList)) {
+ JSONArray subjectMatter = new JSONArray();
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ JSONObject subjectMatterItem = new JSONObject();
+ subjectMatterItem.put("itemNo", contractSubjectMatter.getMaterialCode());
+ subjectMatterItem.put("salePrice", contractSubjectMatter.getUnitPrice());
+ subjectMatterItem.put("qtyRequired", contractSubjectMatter.getQuantity());
+ subjectMatterItem.put("money", contractSubjectMatter.getQuantity().multiply(contractSubjectMatter.getUnitPrice()));
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getCompId, contract.getCompId())
+ .eq(Product::getErpCode, contractSubjectMatter.getMaterialCode()));
+ if (ObjUtil.isNotNull(product)) {
+ subjectMatterItem.put("taxRate", new BigDecimal(product.getTaxRate()).divide(new BigDecimal("100")));
+ }
+ subjectMatterItem.put("dateDeliver", ObjUtil.isNotNull(contractSubjectMatter.getPlannedDeliveryDate()) ?
+ DateUtil.format(contractSubjectMatter.getPlannedDeliveryDate(), DatePattern.NORM_DATETIME_PATTERN) :
+ DateUtil.format(contract.getExpirationDate(), DatePattern.NORM_DATETIME_PATTERN));
+ subjectMatter.add(subjectMatterItem);
+ });
+ request.put("details", subjectMatter);
+ }
+
+ String token = "";
+ if (redisTemplate.hasKey("SMJ_ERP_TOKEN")) {
+ token = (String) redisTemplate.opsForValue().get("SMJ_ERP_TOKEN");
+ } else {
+ token = getErpToken();
+ }
+ if (StrUtil.isEmpty(token)){
+ log.error("鐭崇叅鏈虹櫥褰曡幏鍙杢oken澶辫触");
+ return;
+ }
+
+ log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍏ュ弬锛歿}", request.toJSONString());
+ HttpResponse response = HttpRequest.post(smjztErp + "/api/contract/v1/createWithDetails?tenantId=tenant3")
+ .header("token", token) // 娣诲姞璁よ瘉澶�
+ .header("Content-Type", "application/json") // 璁剧疆鍐呭绫诲瀷
+ .body(request.toJSONString()) // 璁剧疆璇锋眰浣�
+ .execute(); // 鎵ц璇锋眰.post(ymjErp,request.toJSONString());
+ log.info("鐭崇叅鏈洪捇鎺㈠垎鍏徃鍚堝悓鎺ㄩ�乪rp鍥炲弬锛歿}", response.body());
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("smj", request.toJSONString(), response.body());
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", jxc) && StrUtil.isNotEmpty(jxcErp)) {
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍏ュ弬锛歿}", request.toJSONString());
+ String result = HttpUtil.post(jxcErp, request.toJSONString());
+ log.info("鏈烘鍘傚悎鍚屾帹閫乪rp鍥炲弬锛歿}", result);
+ //淇濆瓨璇锋眰璁板綍
+ saveErpRequestRecord("jxc", request.toJSONString(), result);
+ //鏇存柊鍚堝悓erp鎺ㄩ�佹爣璇�
+ contract.setErpPushFlag("1");
+ baseMapper.updateById(contract);
+ }
+ if (StrUtil.equals(contract.getPartyBId() + "", tfgs) && StrUtil.isNotEmpty(tfgsErp)) {
+ //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }).start();
+
+ }
+
+ private String getErpToken() {
+ JSONObject loginJson = new JSONObject();
+ loginJson.put("username", "admin");
+ loginJson.put("password", "Zimafold@2026");
+ log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+ String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
+ log.info("鐭崇叅鏈轰骇鍝佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+ JSONObject respJson = JSONObject.parseObject(loginResp);
+ if (respJson.getInteger("code") == 0) {
+ JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+ redisTemplate.opsForValue().set("SMJ_ERP_TOKEN",dataJson.getString("token"));
+ log.info("鐭崇叅鏈篹rp token涓猴細{}",dataJson.getString("token"));
+ return dataJson.getString("token");
+ }
+ return "";
+ }
+
+ private String getYmjErpToken(){
+ JSONObject loginJson = new JSONObject();
+ loginJson.put("username", "admin");
+ loginJson.put("password", "admin123");
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍏ュ弬锛歿}", loginJson.toJSONString());
+ String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
+ log.info("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢oken鍥炲弬锛歿}", loginResp);
+ JSONObject respJson = JSONObject.parseObject(loginResp);
+ if (respJson.getInteger("code") == 0) {
+ JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
+ redisTemplate.opsForValue().set("YMJ_ERP_TOKEN",dataJson.getString("token"));
+ log.info("涓�鐓ゆ満erp token涓猴細{}",dataJson.getString("token"));
+ return dataJson.getString("token");
+ }
+ return "";
+ }
+
+ 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());
+ ContractPaymentScheduleProcess lastProcess = contractPaymentScheduleProcessMapper.selectOne(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
+ .eq(ContractPaymentScheduleProcess::getContractId, schedule.getContractId())
+ .eq(ContractPaymentScheduleProcess::getScheduleId, schedule.getId()).last("limit 1"));
+ if (ObjUtil.isNull(lastProcess)) {
+ 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);
+ }
+ }
+ }
+ 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);
+ }
+ }
+ }
+
+ }
+ }
+ }
+
private void saveErpRequestRecord(String ymj, String toJSONString, String result) {
ErpRequestRecord record = new ErpRequestRecord();
record.setErpName(ymj);
@@ -874,80 +1140,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
@@ -956,7 +1186,7 @@
.lt(ContractPaymentSchedule::getEffectiveEndDate, DateUtil.today())
.ne(ContractPaymentSchedule::getPaymentStatus, "2")
.ne(ContractPaymentSchedule::getPaymentStatus, 3));
- if (ArrayUtil.isNotEmpty(scheduleList)) {
+ if (CollUtil.isNotEmpty(scheduleList)) {
scheduleList.stream().forEach(contractPaymentSchedule -> {
Contract contract = baseMapper.selectById(contractPaymentSchedule.getContractId());
if (ObjUtil.isNotNull(contract)) {
@@ -1036,7 +1266,8 @@
newContract.setContractStatus(0);
newContract.setBillingAmout(new BigDecimal("0"));
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
newContract.setContractNo(generateSMJContractNo());
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -1164,7 +1395,7 @@
public R genCycleReceiced() {
List<ContractExecDate> execDateList = contractExecDateMapper.selectList(Wrappers.<ContractExecDate>lambdaQuery()
.le(ContractExecDate::getExecDate, DateUtil.today()).eq(ContractExecDate::getGenFlag, "0"));
- if (ArrayUtil.isNotEmpty(execDateList)) {
+ if (CollUtil.isNotEmpty(execDateList)) {
execDateList.stream().forEach(contractExecDate -> {
Contract contract = baseMapper.selectById(contractExecDate.getContractId());
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
@@ -1676,10 +1907,14 @@
@Override
public R addContractSgb(ContractAddDTO addDTO) {
- if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ Contract contractOld = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getDataId, addDTO.getDataId()).last("limit 1"));
+ if (ObjUtil.isNotNull(contractOld)) {
+ return R.failed("鍚堝悓鏁版嵁ID锛歿}宸插瓨鍦紝涓嶈兘鏂板閲嶅鏁版嵁", addDTO.getDataId());
+ }
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
@@ -1697,6 +1932,7 @@
contract.setPaidAmount(new BigDecimal("0"));
contract.setBillingStatus("1");
contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("0");
contract.setBillingAmout(new BigDecimal("0"));
BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
@@ -1728,11 +1964,28 @@
}
baseMapper.insert(contract);
- if (ArrayUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
subjectMatter.setContractId(contract.getId());
-
+ if (StrUtil.isNotBlank(subjectMatter.getMaterialCode())){
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode())
+ .last("limit 1"));
+ if (ObjUtil.isNotNull(product)){
+ subjectMatter.setMaterialInternalName(product.getId()+"");
+ }
+ if (ObjUtil.isNull(product)){
+ product = new Product();
+ product.setParentId(2101559148831944705L);
+ product.setProductName(subjectMatter.getMaterialInternalName());
+ product.setErpCode(subjectMatter.getMaterialCode());
+ product.setProductType(subjectMatter.getSpecification());
+ product.setTaxCode("1090117040000000000");
+ product.setTaxClass("娉�");
+ productMapper.insert(product);
+ subjectMatter.setMaterialInternalName(product.getId()+"");
+ }
+ }
subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
subjectMatter.setDeliveryStatus(0);
subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
@@ -1759,7 +2012,7 @@
}
- if (ArrayUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
AtomicInteger index = new AtomicInteger(1);
addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
int currentIndex = index.getAndIncrement();
@@ -1796,16 +2049,17 @@
}
-
+ //鎺ㄩ�佸悎鍚屼腑蹇�
+// pushCenter(contract.getId());
return R.ok(contract.getContractNo());
}
@Override
public R updateContractSgb(ContractUpdateDTO updateDTO) {
- if (ArrayUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
+ if (CollUtil.isEmpty(updateDTO.getContractSubjectMatter())) {
return R.failed("璇锋坊鍔犳爣鐨勭墿");
}
- if (ArrayUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isEmpty(updateDTO.getContractPaymentSchedule())) {
return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
}
if (!isValidPaymentStages(updateDTO.getContractPaymentSchedule())) {
@@ -1838,7 +2092,7 @@
}
baseMapper.updateById(contract);
- if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractSubjectMatter())) {
contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId, contract.getId()));
updateDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
@@ -1864,7 +2118,7 @@
});
}
- if (ArrayUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
+ if (CollUtil.isNotEmpty(updateDTO.getContractPaymentSchedule())) {
contractPaymentScheduleMapper.delete(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId()));
AtomicInteger index = new AtomicInteger(1);
@@ -2057,21 +2311,21 @@
@Override
public Page fourAssociation(Page page, ContractQueryDTO queryDTO) {
Page<FourAssociationPageVo> page1 = baseMapper.fourAssociation(page, queryDTO, DataScope.of("comp_id"));
- if (ArrayUtil.isNotEmpty(page1.getRecords())) {
+ if (CollUtil.isNotEmpty(page1.getRecords())) {
page1.getRecords().stream().forEach(fourAssociationPageVo -> {
List<PaymentSlip> slips = paymentSlipMapper.selectList(Wrappers.<PaymentSlip>lambdaQuery().eq(PaymentSlip::getContractId, fourAssociationPageVo.getId())
.orderByAsc(PaymentSlip::getPaymentTime));
- if (ArrayUtil.isNotEmpty(slips)) {
+ if (CollUtil.isNotEmpty(slips)) {
fourAssociationPageVo.setSlipVoList(BeanUtil.copyToList(slips, ContractSlipVo.class));
}
List<ContractInvoice> invoices = contractInvoiceMapper.selectList(Wrappers.<ContractInvoice>lambdaQuery().eq(ContractInvoice::getContractId, fourAssociationPageVo.getId())
.orderByAsc(ContractInvoice::getInvoiceTime));
- if (ArrayUtil.isNotEmpty(invoices)) {
+ if (CollUtil.isNotEmpty(invoices)) {
fourAssociationPageVo.setInvoiceVoList(BeanUtil.copyToList(invoices, ContractInvoiceVo.class));
}
if (fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getPaidAmount()) == 0 &&
fourAssociationPageVo.getAmount().compareTo(fourAssociationPageVo.getBillingAmout()) == 0 &&
- ArrayUtil.isNotEmpty(slips) && ArrayUtil.isNotEmpty(invoices)
+ CollUtil.isNotEmpty(slips) && CollUtil.isNotEmpty(invoices)
) {
fourAssociationPageVo.setAssociation("宸插畬鎴�");
}
@@ -2309,7 +2563,8 @@
contract.setNickName(SecurityUtils.getUser().getNickname());
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
contract.setContractNo(generateSMJContractNo());
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -2329,25 +2584,63 @@
}
@Override
- public R pushCenter(Long id) {
- Contract contract = baseMapper.selectById(id);
+ public R pushCenter(PushCenterDTO dto) {
+ Contract contract = baseMapper.selectById(dto.getId());
+
+ contract.setSelectionMethod(dto.getSelectionMethod());
+ contract.setIsRelated(dto.getIsRelated());
+ contract.setContractCreater(dto.getContractCreater());
+ if(StrUtil.isNotBlank(dto.getAttachmentUrl())) {
+ contract.setAttachmentName(dto.getAttachmentName());
+ contract.setAttachmentUrl(dto.getAttachmentUrl());
+ }
+ baseMapper.updateById(contract);
+
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNull(customer)){
+ return R.failed("瀹㈡埛鏌ヨ寮傚父");
+ }
+
+ R<SysDept> r = remoteDeptService.getById(SecurityUtils.getUser().getCompId());
+ if (!r.isOk()){
+ return R.failed("淇℃伅鏌ヨ寮傚父");
+ }
+ SysDept comp = r.getData();
+
List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId, id));
+ .eq(ContractSubjectMatter::getContractId, dto.getId()));
JSONObject requestApply = new JSONObject();
- requestApply.put("fd_selectionmethod", "鍏紑鎷涙爣");
- requestApply.put("fd_isrelated", "鏄�");
+ requestApply.put("fd_selectionmethod", dto.getSelectionMethod());
+ requestApply.put("fd_isrelated", dto.getIsRelated());
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_contractSubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
requestApply.put("fd_docNumber", contract.getContractNo());
- requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");
+
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+ requestApply.put("fd_templateId", tempSMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+ requestApply.put("fd_templateId", tempSGB);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+ requestApply.put("fd_templateId", tempYMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+ requestApply.put("fd_templateId", tempTFGS);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+ requestApply.put("fd_templateId", tempJXC);
+ }
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_contractCreater", StrUtil.isNotEmpty(dto.getContractCreater())?dto.getContractCreater():SecurityUtils.getUser().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)
@@ -2357,37 +2650,67 @@
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);
+ requestApply.put("fd_baozhangren", comp.getBaozhangren());
+ requestApply.put("fd_summary",contract.getSummary());
+ JSONArray signList = new JSONArray();
+ JSONObject j = new JSONObject();
+ j.put("fd_standing","鐢�");
+ j.put("fd_Iden",customer.getCreditCode());
+ j.put("fd_signMain","2");
+ signList.add(j);
+ JSONObject y = new JSONObject();
+ y.put("fd_standing","涔�");
+ y.put("fd_Iden",comp.getOrgCode());
+ y.put("fd_signMain","1");
+ signList.add(y);
+ requestApply.put("fd_signList", signList);
+ if(StrUtil.isNotBlank(contract.getAttachmentUrl())){
+ JSONArray attList = new JSONArray();
+ JSONObject att = new JSONObject();
+ att.put("fd_attNum","1");
+ att.put("fd_attName",contract.getAttachmentName());
+ att.put("fd_attQuality","00");
+ att.put("fd_attcontent",NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + contract.getAttachmentUrl()));
+ attList.add(att);
+ requestApply.put("attList", att);
+ }
+ if (CollUtil.isNotEmpty(subjectMatterList)){
+ JSONArray materialList = new JSONArray();
+ subjectMatterList.stream().forEach(subjectMatter->{
+ JSONObject material = new JSONObject();
+ material.put("fd_materiaCode", subjectMatter.getMaterialCode());
+ material.put("fd_materiaName", subjectMatter.getMaterialInternalName());
+ material.put("fd_specification", StrUtil.isNotBlank(subjectMatter.getSpecification())?subjectMatter.getSpecification():"");
+ material.put("fd_figureNumber", "");
+ material.put("fd_measureUnit", subjectMatter.getUnit());
+ material.put("fd_number", subjectMatter.getQuantity());
+ material.put("fd_price", subjectMatter.getUnitPrice());
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode,subjectMatter.getMaterialCode()).last("limit 1"));
+ if (ObjUtil.isNotNull(product)){
+ material.put("fd_rate", product.getTaxRate().toString());
+ }
+ material.put("fd_amount", subjectMatter.getUnitPrice().multiply(subjectMatter.getQuantity()));
+ material.put("fd_requirements", "");
+ material.put("fd_standard", "");
+ material.put("fd_factory", "");
+ material.put("fd_Deadlines", ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate())?subjectMatter.getPlannedDeliveryDate():"");
+ material.put("fd_delivery", "");
+ material.put("fd_des", "");
+ materialList.add(material);
+ });
+ requestApply.put("materialList", materialList);
+ }
+ log.info("宸ヤ笟娉垫帹閫佲�斺�斿悎鍚屼腑蹇冨悎鍚岃捣鑽夋帴鍙ｅ叆鍙傦細{}", requestApply.toJSONString());
+ String respApply = HttpUtil.post("https://oa.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);
- }
+ contract.setCenterPushFlag("1");
+ baseMapper.updateById(contract);
+ return R.ok();
}
- return R.ok();
+ log.error("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
+ return R.failed("宸ヤ笟娉垫帹閫佲�斺�旀帹閫佸悎鍚屼腑蹇冨鏍稿け璐ワ紝鍘熷洜涓猴細{}",applyResp.getString("msg"));
}
@Override
@@ -2524,13 +2847,17 @@
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"));
+
+ if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+ contract.setContractStatus(3);
+ }
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 +2871,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 ->
@@ -2558,41 +2906,41 @@
schedule.setPaymentRatio(StrUtil.isBlank(resultSchedule.get(j).getPaymentRatio())
? new BigDecimal("0") : new BigDecimal(resultSchedule.get(j).getPaymentRatio()));
schedule.setAgreedDays(StrUtil.isBlank(resultSchedule.get(j).getAgreedDays())
- ? 0 : Integer.valueOf(resultSchedule.get(j).getPaymentRatio()));
+ ? 0 : Integer.valueOf(resultSchedule.get(j).getAgreedDays()));
schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
.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){
- PaymentConfirm confirm = new PaymentConfirm();
- confirm.setBusGuestId(contract.getPartyAId());
- confirm.setBusGuestName(contract.getPartyA());
- confirm.setBusinessType("璐ㄤ繚閲戝簲鏀�");
- confirm.setConfirmTime(new Date());
- confirm.setContractId(contract.getId());
- confirm.setContractName(contract.getContractName());
- 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.setReceivableAmount(confirm.getTransationAmount());
- confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
- paymentConfirmMapper.insert(confirm);
- }
+// 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());
+// confirm.setBusinessType("璐ㄤ繚閲戝簲鏀�");
+// confirm.setConfirmTime(new Date());
+// confirm.setContractId(contract.getId());
+// confirm.setContractName(contract.getContractName());
+// 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.setReceivableAmount(confirm.getTransationAmount());
+// confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
+// paymentConfirmMapper.insert(confirm);
+// }
}
}
}
@@ -2605,4 +2953,434 @@
}
return R.ok();
}
+
+
+ @Override
+ public R subjectChange(ContractSubjectChangeDTO changeDTO) {
+ Contract contract = baseMapper.selectById(changeDTO.getId());
+ if (ObjUtil.isNull(contract)){
+ return R.failed("鍚堝悓鐘舵�佸紓甯�");
+ }
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓宸插紑绁紝涓嶈兘杩涜鍙樻洿");
+ }
+ if (ObjUtil.isNotNull(contract.getOutBoundAmout())&&contract.getOutBoundAmout().compareTo(new BigDecimal("0"))>0){
+ return R.failed("鍚堝悓鏍囩殑鐗╁凡鍑哄簱锛屼笉鑳借繘琛屽彉鏇�");
+ }
+ if (CollUtil.isEmpty(changeDTO.getContractSubjectMatter())){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿涓嶈兘涓虹┖");
+ }
+ BigDecimal changeAmount = changeDTO.getContractSubjectMatter().stream().map(subject->subject.getUnitPrice().multiply(subject.getQuantity())).reduce(BigDecimal.ZERO,BigDecimal::add);
+ if (contract.getAmount().compareTo(changeAmount)!=0){
+ return R.failed("鍚堝悓鍙樻洿鍚庢爣鐨勭墿鎬讳环蹇呴』涓庡悎鍚屾�讳环涓�鑷�");
+ }
+ List<ContractSubjectMatter> beforeList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ ContractSubjectMatterChange change = new ContractSubjectMatterChange();
+ change.setContractId(contract.getId());
+ change.setBeforeChange(JSONObject.toJSONString(beforeList));
+ change.setAfterChange(JSONObject.toJSONString(changeDTO.getContractSubjectMatter()));
+ changeMapper.insert(change);
+ contractSubjectMatterMapper.delete(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,changeDTO.getId()));
+ changeDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ return R.ok();
+ }
+
+ @Override
+ public Page subjectChangePage(Page page, ContracQueryDTO queryDTO) {
+ return changeMapper.subjectChangePage(page,queryDTO,DataScope.of("comp_id"));
+ }
+
+ @Override
+ public R subjectChangeAtt(ContractSubjectChangeAttDTO attDTO) {
+ ContractSubjectMatterChange change = changeMapper.selectById(attDTO.getId());
+ change.setAttachmentName(attDTO.getAttachmentName());
+ change.setAttachmentUrl(attDTO.getAttachmentUrl());
+ changeMapper.updateById(change);
+ return R.ok();
+ }
+
+ @Override
+ public R syncContractStatus(SyncContractStatusDTO dto) {
+ log.info("鍚堝悓瀹℃壒缁撴灉鍚屾锛屽悎鍚岀紪鍙�:{}锛屽鎵圭粨鏋滐細{}",dto.getContractNumber(),dto.getStatus());
+ if (StrUtil.isBlank(dto.getFd_bizId())){
+ return R.failed("鏁版嵁ID涓嶈兘涓虹┖");
+ }
+ if (StrUtil.isBlank(dto.getStatus())){
+ return R.failed("瀹℃壒鐘舵�佷笉鑳戒负绌�");
+ }
+ if (StrUtil.isBlank(dto.getReturnPerson())){
+ return R.failed("瀹℃壒浜轰笉鑳戒负绌�");
+ }
+ if (StrUtil.isBlank(dto.getReturnDate())){
+ return R.failed("瀹℃壒鏃堕棿涓嶈兘涓虹┖");
+ }
+ Contract contract = baseMapper.selectById(dto.getFd_bizId());
+ if(ObjUtil.isNull(contract)){
+ return R.failed("鏁版嵁ID寮傚父");
+ }
+ if (StrUtil.equals(dto.getStatus(),"1")){
+ takeEffect(contract.getId());
+ }
+ if (StrUtil.equals(dto.getStatus(),"2")){
+ refuseApproval(contract.getId());
+ }
+ if (StrUtil.equals(dto.getStatus(),"3")||StrUtil.equals(dto.getStatus(),"4")){
+ contract.setContractStatus(3);
+ baseMapper.updateById(contract);
+ }
+ saveContractApproval(contract,dto);
+ return R.ok();
+ }
+
+ private void saveContractApproval(Contract contract, SyncContractStatusDTO dto) {
+ ContractApproval approval = BeanUtil.copyProperties(dto,ContractApproval.class);
+ approval.setContractId(contract.getId());
+ approval.setReturnDateTime(DateUtil.parseDateTime(dto.getReturnDate()));
+ approval.setCompId(contract.getCompId());
+ contractApprovalMapper.insert(approval);
+ }
+
+ @Override
+ public R finallyPdf(ContractFinallyDTO attDTO) {
+ Contract contract = baseMapper.selectById(attDTO.getId());
+ if (ObjUtil.isNull(contract)){
+ return R.failed("鍚堝悓寮傚父");
+ }
+ if (!StrUtil.equals(contract.getContractStatus()+"","2")){
+ return R.failed("鍚堝悓寮傚父鐘舵��");
+ }
+ contract.setSignDate(attDTO.getSignDate());
+ contract.setExpirationDate(attDTO.getExpirationDate());
+ contract.setSinger(attDTO.getSinger());
+ contract.setReviewerNo(attDTO.getReviewerNo());
+ contract.setLinkPerson(attDTO.getLinkPerson());
+ contract.setLinkPhone(attDTO.getLinkPhone());
+ Long betweenDay = DateUtil.betweenDay(attDTO.getExpirationDate(),attDTO.getSignDate(),true);
+ contract.setDeliveryCycle(betweenDay.intValue());
+ baseMapper.updateById(contract);
+ JSONObject request = new JSONObject();
+ request.put("fd_docNumber", contract.getContractNo());
+ request.put("fd_singer", StrUtil.isNotEmpty(attDTO.getSinger())?attDTO.getSinger():SecurityUtils.getUser().getNickname());
+ request.put("fd_signTime", DateUtil.formatDate(contract.getSignDate()));
+ request.put("fd_linkPerson", StrUtil.isNotEmpty(attDTO.getLinkPerson())?attDTO.getLinkPerson():"");
+ request.put("fd_linkPhone", StrUtil.isNotEmpty(attDTO.getLinkPhone())?attDTO.getLinkPhone():"");
+ 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", StrUtil.isNotEmpty(attDTO.getReviewerNo())?attDTO.getReviewerNo():SecurityUtils.getUser().getNickname());
+ request.put("fd_docStatus", "20");
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
+ request.put("fd_templateId", tempSMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
+ request.put("fd_templateId", tempSGB);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
+ request.put("fd_templateId", tempYMJ);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
+ request.put("fd_templateId", tempTFGS);
+ }
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
+ request.put("fd_templateId", tempJXC);
+ }
+ request.put("fd_attName", attDTO.getLastAttachmentName());
+ request.put("fd_attcontent", NetworkFileToBase64.convertNetworkFileToBase64("https://zbjt.res.jzeg.cn/api" + attDTO.getLastAttachmentUrl()));
+ log.info("鍚堝悓涓績鍚屾鍚堝悓鎺ュ彛鍏ュ弬锛歿}", request.toJSONString());
+ String resp = HttpUtil.post("https://oa.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.setLastAttachmentName(attDTO.getLastAttachmentName());
+ contract.setLastAttachmentUrl(attDTO.getLastAttachmentUrl());
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+ return R.failed("鍚堝悓涓績鏈�缁堢洊绔犵櫥璁癙DF涓婁紶澶辫触,鍘熷洜涓�:{}",respJson.getString("msg"));
+ }
+
+
+ @Override
+ public R addContractSgbHis(ContractAddDTO addDTO) {
+
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ return R.failed("璇锋坊鍔犳爣鐨勭墿");
+ }
+ if (CollUtil.isEmpty(addDTO.getContractPaymentSchedule())) {
+ return R.failed("璇锋坊鍔犱粯娆鹃樁娈垫垨浠樻闃舵缂哄皯");
+ }
+ if (!isValidPaymentStages(addDTO.getContractPaymentSchedule())) {
+ return R.failed("浠樻闃舵淇℃伅寮傚父");
+ }
+ if (addDTO.getContractPaymentSchedule().stream().map(item -> item.getPaymentRatio()).reduce(BigDecimal.ZERO, BigDecimal::add)
+ .compareTo(new BigDecimal("100.00")) != 0) {
+ return R.failed("浠樻闃舵姣斾緥寮傚父");
+ }
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+ contract.setErpContractNo(contract.getContractNo());
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ contract.setContractStatus(2);
+ contract.setPaidAmount(new BigDecimal("0"));
+ contract.setBillingStatus("1");
+ contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("1");
+ contract.setBillingAmout(new BigDecimal("0"));
+
+ BusinessCustomer bc = businessCustomerMapper.selectOne(Wrappers.<BusinessCustomer>lambdaQuery().eq(BusinessCustomer::getErpCompanyCode,
+ addDTO.getPartyACode()).last("limit 1"));
+ if (ObjUtil.isNull(bc)) {
+ return R.failed("erp瀹㈡埛缂栫爜涓嶅瓨鍦�");
+ }
+ contract.setPartyAId(bc.getId());
+ contract.setPartyA(bc.getCompanyName());
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+ }
+ if (ObjUtil.isNotNull(contract.getSignDate()) && ObjUtil.isNotNull(contract.getExpirationDate())) {
+ Long bd = DateUtil.betweenDay(contract.getExpirationDate(), contract.getSignDate(), true);
+ contract.setDeliveryCycle(bd.intValue());
+ }
+ contract.setContractNo(generateGYBContractNo());
+
+ if (!StrUtil.equals(addDTO.getContractCategory(), "water_house")) {
+ // 鍋囪 list 鏄綘鐨� List<ContractSubjectMatterAddDTO>
+ Optional<ContractSubjectMatterAddDTO> maxDateObj = addDTO.getContractSubjectMatter().stream()
+ .filter(item -> item.getPlannedDeliveryDate() != null) // 杩囨护鎺夋棩鏈熶负绌虹殑椤癸紝閬垮厤 NullPointerException
+ .max(Comparator.comparing(ContractSubjectMatterAddDTO::getPlannedDeliveryDate));
+
+ if (maxDateObj.isPresent()) {
+ contract.setExpirationDate(maxDateObj.get().getPlannedDeliveryDate());
+
+ }
+ }
+ baseMapper.insert(contract);
+
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setTotalAmount(contractSubjectMatterAddDTO.getQuantity().multiply(contractSubjectMatterAddDTO.getUnitPrice()));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ //姘寸數绫诲繀椤绘湁鍒濇琛ㄥ彿
+ if (StrUtil.isNotEmpty(contractSubjectMatterAddDTO.getMeterReadCode()) &&
+ ObjUtil.isNotNull(contractSubjectMatterAddDTO.getMeterReadNum())) {
+ MeterReadRecord record = BeanUtil.copyProperties(contractSubjectMatterAddDTO, MeterReadRecord.class, "id");
+ record.setContractId(contract.getId());
+ record.setMatterId(subjectMatter.getId());
+ record.setContractName(contract.getContractName());
+ record.setBusGuestId(contract.getPartyAId());
+ record.setBusGuestName(contract.getPartyA());
+ record.setMeterReadTime(new Date());
+ meterReadRecordMapper.insert(record);
+ }
+ if (StrUtil.isNotEmpty(addDTO.getContractCategory()) && StrUtil.equals(addDTO.getContractCategory(), "ymjcg")
+ && ObjUtil.isNotNull(subjectMatter.getPlannedDeliveryDate()) && ObjUtil.isNotNull(contract.getExpirationDate())
+ && DateUtil.compare(contract.getExpirationDate(), subjectMatter.getPlannedDeliveryDate()) > 0) {
+ contract.setExpirationDate(subjectMatter.getPlannedDeliveryDate());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+ AtomicInteger index = new AtomicInteger(1);
+ addDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
+ int currentIndex = index.getAndIncrement();
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("鍚堝悓绛捐")) {
+ schedule.setEffectiveEndDate(DateUtil.offsetDay(contract.getSignDate(), contractPaymentScheduleAddDTO.getAgreedDays()));
+ }
+ if (ObjUtil.isNotNull(schedule.getEffectiveDate())) {
+ if (schedule.getEffectiveDate().before(DateUtil.date())) {
+ schedule.setFulfillmentStatus(1);
+ } else {
+ schedule.setFulfillmentStatus(0);
+ }
+ }
+ if (contractPaymentScheduleAddDTO.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ schedule.setPaymentStatus(0);
+ } else {
+ schedule.setPaymentStatus(3);
+ }
+ schedule.setContractId(contract.getId());
+ schedule.setContractName(contract.getContractName());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio().divide(new BigDecimal("100"))));
+ schedule.setStageOrder(currentIndex);
+ contractPaymentScheduleMapper.insert(schedule);
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (contractPaymentScheduleAddDTO.getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ });
+
+ }
+
+ return R.ok(contract.getContractNo());
+ }
+
+ @Override
+ public R addContractHis(ContractAddDTO addDTO) {
+ Contract contract = BeanUtil.copyProperties(addDTO, Contract.class);
+ contract.setPartyBId(SecurityUtils.getUser().getCompId());
+ contract.setPartyB(SecurityUtils.getUser().getCompName());
+ if (StrUtil.isEmpty(addDTO.getPartyA())) {
+ BusinessCustomer bc = businessCustomerMapper.selectById(addDTO.getPartyAId());
+ if (ObjUtil.isNotNull(bc)) {
+ contract.setPartyA(bc.getCompanyName());
+ }
+ if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
+ && StrUtil.isEmpty(bc.getCreditCode())) {
+ return R.failed("璇峰畬鍠勫鎴稥RP缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
+ }
+ }
+
+ contract.setBillingStatus("1");
+ contract.setErpPushFlag("1");
+ contract.setCenterPushFlag("1");
+ contract.setContractStatus(2);
+ contract.setNickName(SecurityUtils.getUser().getNickname());
+ contract.setNextScheduleName("鍙戣揣鍓�");
+ if (ObjUtil.isNotNull(addDTO.getDeliveryCycle())) {
+ contract.setExpirationDate(DateUtil.offsetDay(addDTO.getSignDate(), addDTO.getDeliveryCycle()));
+ }
+
+ if (CollUtil.isEmpty(addDTO.getContractSubjectMatter())) {
+ return R.failed("鏍囩殑鐗╀笉鑳戒负绌�");
+ }
+
+ baseMapper.insert(contract);
+
+ if (CollUtil.isNotEmpty(addDTO.getContractSubjectMatter())) {
+ addDTO.getContractSubjectMatter().stream().forEach(contractSubjectMatterAddDTO -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatterAddDTO, ContractSubjectMatter.class);
+ subjectMatter.setContractId(contract.getId());
+ subjectMatter.setDeliveredQuantity(ObjUtil.isNull(contractSubjectMatterAddDTO.getDeliveredQuantity())
+ ? new BigDecimal("0") : contractSubjectMatterAddDTO.getDeliveredQuantity());
+ 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);
+ });
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus,2));
+ if (CollUtil.isEmpty(subjectMatterList)){
+ contract.setNextScheduleName("璐у埌绛炬敹");
+ baseMapper.updateById(contract);
+ }
+ }
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
+ if (CollUtil.isNotEmpty(addDTO.getContractPaymentSchedule())) {
+
+ for (int j = 0; j < addDTO.getContractPaymentSchedule().size(); j++) {
+ ContractPaymentSchedule schedule = new ContractPaymentSchedule();
+ schedule.setStageName(addDTO.getContractPaymentSchedule().get(j).getStageName());
+ schedule.setContractId(contract.getId());
+ schedule.setPaymentRatio(addDTO.getContractPaymentSchedule().get(j).getPaymentRatio());
+ schedule.setAgreedDays(addDTO.getContractPaymentSchedule().get(j).getAgreedDays());
+ schedule.setPlannedAmount(contract.getAmount().multiply(schedule.getPaymentRatio())
+ .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) {
+ remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
+ schedule.setPaymentStatus(2);
+ schedule.setActualAmount(schedule.getPlannedAmount());
+ }
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
+ schedule.setPaymentStatus(1);
+ schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
+ }
+ }
+ contractPaymentScheduleMapper.insert(schedule);
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐у埌绛炬敹")) {
+ contract.setArrivalScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璋冭瘯瀹屾垚鎴栭獙鏀�")) {
+ contract.setAcceptScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ if (addDTO.getContractPaymentSchedule().get(j).getStageName().equals("璐ㄤ繚閲�")) {
+ contract.setWarrantyScheduleId(schedule.getId());
+ baseMapper.updateById(contract);
+ }
+ }
+ }
+
+ if (contract.getPaidAmount().compareTo(contract.getAmount())==0&&contract.getBillingAmout().compareTo(contract.getAmount())==0){
+ contract.setContractStatus(3);
+ baseMapper.updateById(contract);
+ }
+ return R.ok();
+ }
+
+ @Override
+ public R getFinallyInfo(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ return R.ok(BeanUtil.copyProperties(contract,ContractFinallyVo.class));
+ }
+
+ @Override
+ public R erpPush(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, id));
+ pushSubCompany(contract,subjectMatterList);
+ return R.ok();
+ }
+
+ @Override
+ public R associationPartyC(ContractAssociationPartyCyDTO associationPartyCyDTO) {
+ Contract contract = baseMapper.selectById(associationPartyCyDTO.getId());
+ contract.setPartyCId(Long.valueOf(associationPartyCyDTO.getPartyCId()));
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+
+ @Override
+ public R getInvoiceObj(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ ContractInvoiceObjVo objVo = BeanUtil.copyProperties(contract,ContractInvoiceObjVo.class);
+ List<BusinessCustomerSelectVo> selectVoList = new ArrayList<>();
+ BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
+ if (ObjUtil.isNotNull(a)){
+ objVo.setPartyA(a.getCompanyName());
+ objVo.setPartyAOrgCode(a.getCreditCode());
+ objVo.setInvoiceType(StrUtil.isNotBlank(a.getInvoiceType())?a.getInvoiceType():"01");
+ BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(a,BusinessCustomerSelectVo.class);
+ selectVoList.add(selectVo);
+ }
+ if (ObjUtil.isNotNull(contract.getPartyCId())){
+ BusinessCustomer c = businessCustomerMapper.selectById(contract.getPartyCId());
+ if (ObjUtil.isNotNull(c)){
+ BusinessCustomerSelectVo selectVo = BeanUtil.copyProperties(c,BusinessCustomerSelectVo.class);
+ selectVoList.add(selectVo);
+ }
+ }
+ objVo.setLinkPartyC(selectVoList);
+ return R.ok(objVo);
+ }
}
--
Gitblit v1.9.1