From 9171db8f5ddd91b4619bf6a928dcbe98b82f33a0 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 09 九月 2026 15:34:14 +0800
Subject: [PATCH] feat:工业泵收款推送 bip收款单与收款确认分离 开票前校验产品是否维护税收分类信息
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 863 ++++++++++++++++++++++++++++----------------------------
1 files changed, 431 insertions(+), 432 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..101e539 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -28,6 +28,8 @@
import com.by4cloud.platformx.business.dto.*;
import com.by4cloud.platformx.business.entity.*;
import com.by4cloud.platformx.business.mapper.*;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
+import com.by4cloud.platformx.business.service.ContractPaymentScheduleService;
import com.by4cloud.platformx.business.service.ContractService;
import com.by4cloud.platformx.business.utils.BatchInsertListener;
import com.by4cloud.platformx.business.utils.ItemGeneratorUtil;
@@ -89,6 +91,8 @@
private final StringRedisTemplate redisTemplate;
private final ContractOutBoundMapper contractOutBoundMapper;
private final RemoteDictService remoteDictService;
+ private final ContractPaymentScheduleProcessService processService;
+ private final ContractSubjectMatterChangeMapper changeMapper;
@Value("${erp.ymj}")
private String ymjErp;
@@ -136,8 +140,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缂栫爜鎴栫粍缁囨満鏋勪唬鐮�");
}
}
@@ -431,9 +436,35 @@
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;
}
@@ -464,346 +495,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();
@@ -866,6 +578,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("涓�鐓ゆ満鍚堝悓鎺ㄩ�佽幏鍙杢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);
+ }
+
+ }
+ 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("鐭崇叅鏈哄悎鍚屾帹閫佽幏鍙杢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)) {
+ //閫氭柟鍏徃閫氳繃绯荤粺褰曞叆
+ }
+
+ } 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 +844,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 +890,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 +1098,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 +1610,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())) {
@@ -1728,7 +1662,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 +1693,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();
@@ -1802,10 +1736,10 @@
@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 +1772,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 +1798,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 +1991,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("宸插畬鎴�");
}
@@ -2524,13 +2458,13 @@
contract.setPartyB(SecurityUtils.getUser().getCompName());
contract.setPartyBId(SecurityUtils.getUser().getCompId());
contract.setContractStatus(2);
- contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0"));
- contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout())?
- contract.getBillingAmout():new BigDecimal("0"));
+ contract.setPaidAmount(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0"));
+ contract.setBillingAmout(ObjUtil.isNotNull(contract.getBillingAmout()) ?
+ contract.getBillingAmout() : new BigDecimal("0"));
contract.setBillingStatus("1");
baseMapper.insert(contract);
- BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount())?contract.getPaidAmount():new BigDecimal("0");
+ BigDecimal remainAmount = ObjUtil.isNotNull(contract.getPaidAmount()) ? contract.getPaidAmount() : new BigDecimal("0");
List<ContractSubjectMatterExceVO> resultMatter = matterList.stream().filter(item ->
StrUtil.isNotBlank(item.getMaterialCode()) &&
StrUtil.equals(item.getContractNo(), contract.getContractNo())).collect(Collectors.toList());
@@ -2544,7 +2478,28 @@
subjectMatter.setRemainingQuantity(subjectMatter.getQuantity().subtract(subjectMatter.getDeliveredQuantity()));
subjectMatter.setDeliveryStatus(subjectMatter.getRemainingQuantity().compareTo(subjectMatter.getQuantity()) == 0 ? 0
: subjectMatter.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0 ? 1 : 2);
+ subjectMatter.setLineNo(ItemGeneratorUtil.nextId());
contractSubjectMatterMapper.insert(subjectMatter);
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+ //鍑哄簱鍗�
+ ContractOutBound outBound = new ContractOutBound();
+ outBound.setBusGuestId(contract.getPartyAId());
+ outBound.setBusGuestName(contract.getPartyA());
+ outBound.setContractId(contract.getId());
+ outBound.setContractName(contract.getContractName());
+ outBound.setInvoiceNum(new BigDecimal("0"));
+ outBound.setInvoiceStatus("0");
+ outBound.setOutBoundTime(new Date());
+ outBound.setOutBoundNum(subjectMatter.getDeliveredQuantity());
+ outBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+ outBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
+ contractOutBoundMapper.insert(outBound);
+ if (contract.getBillingAmout().compareTo(new BigDecimal("0")) == 0) {
+ contract.setBillingStatus("2");
+ baseMapper.updateById(contract);
+ }
+ }
+
}
}
List<ContractPaymentScheduleExceVO> resultSchedule = scheduleList.stream().filter(item ->
@@ -2563,20 +2518,20 @@
.divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP));
schedule.setPaymentStatus(0);
schedule.setStageOrder(j + 1);
- if (remainAmount.compareTo(new BigDecimal("0"))>0&&schedule.getPlannedAmount().compareTo(new BigDecimal("0"))>0){
+ if (remainAmount.compareTo(new BigDecimal("0")) > 0 && schedule.getPlannedAmount().compareTo(new BigDecimal("0")) > 0) {
remainAmount = remainAmount.subtract(schedule.getPlannedAmount());
- if (remainAmount.compareTo(new BigDecimal("0"))>=0){
+ if (remainAmount.compareTo(new BigDecimal("0")) >= 0) {
schedule.setPaymentStatus(2);
schedule.setActualAmount(schedule.getPlannedAmount());
}
- if (remainAmount.compareTo(new BigDecimal("0"))<0){
+ if (remainAmount.compareTo(new BigDecimal("0")) < 0) {
schedule.setPaymentStatus(1);
schedule.setActualAmount(schedule.getPlannedAmount().add(remainAmount));
}
}
contractPaymentScheduleMapper.insert(schedule);
- if (schedule.getStageName().equals("璐ㄤ繚閲�")&&contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0")).compareTo(new BigDecimal("0"))>0){
+ if (schedule.getStageName().equals("璐ㄤ繚閲�") && contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")).compareTo(new BigDecimal("0")) > 0) {
PaymentConfirm confirm = new PaymentConfirm();
confirm.setBusGuestId(contract.getPartyAId());
confirm.setBusGuestName(contract.getPartyA());
@@ -2587,8 +2542,8 @@
confirm.setContractNo(contract.getContractNo());
confirm.setScheduleId(schedule.getId());
confirm.setScheduleName(schedule.getStageName());
- confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount())?
- contract.getPaidAmount():new BigDecimal("0")));
+ confirm.setTransationAmount(contract.getAmount().subtract(ObjUtil.isNotNull(contract.getPaidAmount()) ?
+ contract.getPaidAmount() : new BigDecimal("0")));
confirm.setReceivableAmount(confirm.getTransationAmount());
confirm.setTotalAmount(confirm.getTransationAmount().multiply(new BigDecimal("-1")));
paymentConfirmMapper.insert(confirm);
@@ -2605,4 +2560,48 @@
}
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"));
+ }
}
--
Gitblit v1.9.1