2025/platformx-business-finance.git

			@@ -28,6 +28,8 @@
			import com.by4cloud.platformx.business.dto.*;
			import com.by4cloud.platformx.business.entity.*;
			import com.by4cloud.platformx.business.mapper.*;
			import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
			import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
			import com.by4cloud.platformx.business.service.ContractService;
			import com.by4cloud.platformx.business.utils.BatchInsertListener;
			import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
			@@ -89,6 +91,9 @@
			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;
			@@ -126,6 +131,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 +156,9 @@
			if (ObjUtil.isNotNull(bc)) {
			contract.setPartyA(bc.getCompanyName());
			}
			if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())) {
			return R.failed("请完善客户ERP编码");
			if (!StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb) && StrUtil.isEmpty(bc.getErpCompanyCode())
			&& StrUtil.isEmpty(bc.getCreditCode())) {
			return R.failed("请完善客户ERP编码或组织机构代码");
			}
			}

			@@ -431,30 +452,117 @@
			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);


			//简易合同无法继续后续操作
			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", "公开招标");
			requestApply.put("fd_isrelated", "是");
			requestApply.put("fd_bizId", contract.getId());
			requestApply.put("fd_remark", contract.getRemark());
			requestApply.put("fd_MainContent", "");
			requestApply.put("fd_settlementType", "00");
			requestApply.put("fd_applyType", "外销");
			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)) {
			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_currency", "人民币");
			requestApply.put("fd_ContractAmount", contract.getAmount());
			requestApply.put("fd_finAmount", contract.getAmount().divide(new BigDecimal("113"), 2, RoundingMode.HALF_UP)
			.multiply(new BigDecimal("87")));
			requestApply.put("fd_docStatus", "20");
			requestApply.put("fd_taxRates", 13);
			requestApply.put("fd_customerName", contract.getPartyA());
			requestApply.put("fd_systemSource", "非煤销售系统");
			requestApply.put("fd_type", "00");
			log.info("合同中心合同起草接口入参：{}", requestApply.toJSONString());
			String respApply = HttpUtil.post("https://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 +572,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("一煤机合同推送获取token入参：{}", loginJson.toJSONString());
			String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
			log.info("一煤机合同推送获取token回参：{}", loginResp);
			JSONObject respJson = JSONObject.parseObject(loginResp);
			if (respJson.getInteger("code") == 0) {
			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
			log.info("一煤机合同推送erp入参：{}", 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("一煤机合同推送erp回参：{}", 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("石煤机合同推送获取token入参：{}", loginJson.toJSONString());
			String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
			log.info("石煤机合同推送获取token回参：{}", loginResp);
			JSONObject respJson = JSONObject.parseObject(loginResp);
			if (respJson.getInteger("code") == 0) {
			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
			log.info("石煤机合同推送erp入参：{}", 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("石煤机合同推送erp回参：{}", 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("机械厂合同推送erp入参：{}", request.toJSONString());
			String result = HttpUtil.post(jxcErp, request.toJSONString());
			log.info("机械厂合同推送erp回参：{}", 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();
			@@ -866,6 +655,264 @@
			}).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);
			}

			JSONObject loginJson = new JSONObject();
			loginJson.put("username", "admin");
			loginJson.put("password", "admin123");
			log.info("一煤机合同推送获取token入参：{}", loginJson.toJSONString());
			String loginResp = HttpUtil.post(ymjErp + "/api/account/v1/login", loginJson.toJSONString());
			log.info("一煤机合同推送获取token回参：{}", loginResp);
			JSONObject respJson = JSONObject.parseObject(loginResp);
			if (respJson.getInteger("code") == 0) {
			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
			log.info("一煤机合同推送erp入参：{}", 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("一煤机合同推送erp回参：{}", response.body());
			//保存请求记录
			saveErpRequestRecord("ymj", request.toJSONString(), response.body());
			//更新合同erp推送标识
			contract.setErpPushFlag("1");
			baseMapper.updateById(contract);
			}

			}
			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 (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);
			}

			JSONObject loginJson = new JSONObject();
			loginJson.put("username", "admin");
			loginJson.put("password", "Zimafold@2026");
			log.info("石煤机合同推送获取token入参：{}", loginJson.toJSONString());
			String loginResp = HttpUtil.post(smjErp + "/api/account/v1/login", loginJson.toJSONString());
			log.info("石煤机合同推送获取token回参：{}", loginResp);
			JSONObject respJson = JSONObject.parseObject(loginResp);
			if (respJson.getInteger("code") == 0) {
			JSONObject dataJson = JSONObject.parseObject(respJson.getString("data"));
			log.info("石煤机合同推送erp入参：{}", 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("石煤机合同推送erp回参：{}", 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("机械厂合同推送erp入参：{}", request.toJSONString());
			String result = HttpUtil.post(jxcErp, request.toJSONString());
			log.info("机械厂合同推送erp回参：{}", 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 void saveScheduleProcess(Contract contract,ContractPaymentSchedule schedule) {
			//新增合同履约记录
			ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
			process.setContractId(contract.getId());
			process.setContractName(contract.getContractName());
			process.setScheduleId(schedule.getId());
			process.setScheduleName(schedule.getStageName());
			process.setProcessDate(contract.getSignDate());
			contractPaymentScheduleProcessMapper.insert(process);
			}

			private void handleWaterHouseCycle(Contract contract, List<ContractSubjectMatter> subjectMatterList) {
			if (CollUtil.isNotEmpty(subjectMatterList)) {
			for (ContractSubjectMatter contractSubjectMatter : subjectMatterList) {
			if (StrUtil.equals(contract.getExecFrequency(), "1")) {
			Long weeksTrue = DateUtil.betweenWeek(DateUtil.beginOfWeek(contract.getEffectiveDate()),
			DateUtil.endOfWeek(contract.getExpirationDate()), true) + 1;
			//循环日期
			Date execDate0 = DateUtil.offsetDay(DateUtil.beginOfWeek(contract.getEffectiveDate()), contract.getExecDay());
			for (int i = 0; i < weeksTrue.intValue(); i++) {
			Date execDatei = DateUtil.offsetWeek(execDate0, i);
			ContractExecDate execDate = new ContractExecDate();
			execDate.setContractId(contract.getId());
			execDate.setMatterId(contractSubjectMatter.getId());
			execDate.setExecDate(execDatei);
			execDate.setGenFlag("0");
			if (DateUtil.isIn(execDatei, contract.getEffectiveDate(), contract.getExpirationDate())) {
			contractExecDateMapper.insert(execDate);
			}
			}
			}
			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 +921,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 +967,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)) {
			@@ -1164,7 +1175,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 +1687,10 @@

			@Override
			public R addContractSgb(ContractAddDTO addDTO) {
			if (ArrayUtil.isEmpty(addDTO.getContractSubjectMatter())) {
			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 +1708,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,7 +1740,7 @@
			}
			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());
			@@ -1759,7 +1771,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 +1808,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 +1851,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 +1877,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 +2070,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("已完成");
			}
			@@ -2343,7 +2356,23 @@
			requestApply.put("fd_applyType", "外销");
			requestApply.put("fd_contractsubject ", subjectMatterList.stream().map(item -> item.getMaterialName()).collect(Collectors.joining(",")));
			requestApply.put("fd_docNumber", contract.getContractNo());
			requestApply.put("fd_templateId", "19e39bb6c1edadbdb162c434274a8a18");

			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) \|\| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) \|\|
			StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
			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()));
			@@ -2358,36 +2387,15 @@
			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());
			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();
			return R.failed("推送合同中心审核失败，原因为：{}",applyResp.getString("msg"));
			}

			@Override
			@@ -2524,13 +2532,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 +2556,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 +2591,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 +2638,372 @@
			}
			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) {
			if (StrUtil.isBlank(dto.getContractNumber())){
			return R.failed("合同编号不能为空");
			}
			if (StrUtil.isBlank(dto.getStatus())){
			return R.failed("审批状态不能为空");
			}
			if (StrUtil.isBlank(dto.getReturnPerson())){
			return R.failed("审批人不能为空");
			}
			if (StrUtil.isBlank(dto.getReturnDateTime())){
			return R.failed("审批时间不能为空");
			}
			Contract contract = baseMapper.selectOne(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,dto.getContractNumber()).last("limit 1"));
			if(ObjUtil.isNull(contract)){
			return R.failed("合同编号不异常");
			}
			if (StrUtil.equals(dto.getStatus(),"1")){
			takeEffect(contract.getId());
			}
			if (!StrUtil.equals(dto.getStatus(),"1")){
			refuseApproval(contract.getId());
			}
			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.getReturnDateTime()));
			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("合同异常状态");
			}
			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");
			if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) \|\| StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) \|\|
			StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
			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("合同中心最终盖章登记PDF上传失败,原因为:{}",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("请完善客户ERP编码或组织机构代码");
			}
			}

			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();
			}
			}