From fca21683e1b5b906d2514082ddfbae8eb820c9ea Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 15 五月 2026 17:12:55 +0800
Subject: [PATCH] feat:合同模版、出库标的物、合同管理拆分
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 8
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CurrentOverdueController.java | 1
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractTemplateController.java | 127 +++++++++
platformx-business-finance-biz/src/main/resources/mapper/ContractTemplateMapper.xml | 17 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java | 43 +-
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/api/feign/RemoteFlowProcessService.java | 19 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java | 15
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractTemplateServiceImpl.java | 16 +
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractTemplate.java | 31 ++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java | 2
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleVo.java | 7
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/HistoryOverdueController.java | 2
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractTemplateMapper.java | 11
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java | 115 +++++++
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java | 21 +
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java | 50 +++
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java | 6
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 235 ++++++++++-------
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 14
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 10
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractTemplateService.java | 9
21 files changed, 602 insertions(+), 157 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/api/feign/RemoteFlowProcessService.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/api/feign/RemoteFlowProcessService.java
new file mode 100644
index 0000000..fd16c3d
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/api/feign/RemoteFlowProcessService.java
@@ -0,0 +1,19 @@
+package com.by4cloud.platformx.business.api.feign;
+
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author syt
+ * @date 2025骞�5鏈�23鏃� 14:29:13
+ */
+@FeignClient(contextId = "remoteFlowProcessService", value = "platformx-business",url = "${servers.main-url}")
+public interface RemoteFlowProcessService {
+
+ @PostMapping("/process-instance/startProcessInstance")
+ R startProcessInstance(@RequestBody ProcessInstanceParamDto processInstanceParamDto);
+
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
index 6f9448f..5d82fae 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/constant/FlowNameEnum.java
@@ -11,8 +11,6 @@
@Getter
@AllArgsConstructor
public enum FlowNameEnum {
- 椤圭洰鐢虫姤("椤圭洰鐢虫姤"),涓撳埄鐢宠("涓撳埄鐢宠"),杞欢钁椾綔鏉冪敵鎶�("杞欢钁椾綔鏉冪敵鎶�"),涓撳埄鏀惧純鐢宠("涓撳埄鏀惧純鐢宠"),椤圭洰鍙樻洿鐢宠("椤圭洰鍙樻洿鐢宠"),
- 椤圭洰楠屾敹鐢宠("椤圭洰楠屾敹鐢宠"),鎴愭灉濂栧姳鐢虫姤("鎴愭灉濂栧姳鐢虫姤"),浜烘墠濂栧姳鐢虫姤("浜烘墠濂栧姳鐢虫姤"),鎴愭灉濂栧姳鐢虫姤1("鎴愭灉濂栧姳鐢虫姤1"),
- 绉戞妧杩涙濂栫敵鎶�("绉戞妧杩涙濂栫敵鎶�"),椤圭洰搴旂敤璇佹槑鐢虫姤("椤圭洰搴旂敤璇佹槑鐢虫姤");
- private String name;
+ 鍚堝悓瀹℃壒("鍚堝悓瀹℃壒");
+ private String name;
}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index 7a1110b..dc99a95 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -1,11 +1,9 @@
package com.by4cloud.platformx.business.dto;
-import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
-import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -60,8 +58,11 @@
@Schema(description = "鐢熸晥鏃ユ湡")
private String effectiveDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ private Integer deliveryCycle;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
private String expirationDate;
@@ -71,6 +72,9 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "妯＄増ID")
+ private Long templateId;
+
private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
private List<ContractSubjectMatterAddDTO> contractSubjectMatter;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index dbd114c..de78174 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -94,8 +94,8 @@
@Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡'")
private Integer deliveryCycle;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
@Column(columnDefinition = "date comment '鍒版湡鏃ユ湡'")
private Date expirationDate;
@@ -143,6 +143,10 @@
@Column(columnDefinition = "VARCHAR(128) comment '涓嬩竴闃舵'")
private String nextScheduleName;
+ @Schema(description = "妯＄増ID")
+ @Column(columnDefinition = "bigint comment '妯＄増ID'")
+ private Long templateId;
+
/**
* 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
*/
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractTemplate.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractTemplate.java
new file mode 100644
index 0000000..291f048
--- /dev/null
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractTemplate.java
@@ -0,0 +1,31 @@
+package com.by4cloud.platformx.business.entity;
+
+import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import lombok.Data;
+import org.hibernate.annotations.Table;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 2026骞�4鏈�29鏃� 10:46:07
+ * syt
+ */
+@Data
+@Entity//鍔犱簡鎵嶈兘鑷姩鐢熸垚琛�
+@Table(appliesTo="contract_template",comment = "鍚堝悓妯＄増")//缁欒〃鍔犳敞閲�
+@jakarta.persistence.Table(name = "contract_template")//鏁版嵁搴撳垱寤虹殑琛ㄦ槑
+public class ContractTemplate extends BaseModel<ContractTemplate> {
+
+ @Schema(description = "妯＄増鍚嶇О")
+ @Column(columnDefinition = "VARCHAR(64) comment '妯＄増鍚嶇О'")
+ private String templateName;
+
+ @Schema(description = "妯＄増璺緞")
+ @Column(columnDefinition="VARCHAR(255) comment '妯＄増璺緞'")
+ private String templatePath;
+}
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
index 42ed018..72682e9 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java
@@ -54,13 +54,16 @@
@Schema(description = "绛剧讲鏃ユ湡")
private String signDate;
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ private Integer deliveryCycle;
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "鐢熸晥鏃ユ湡")
private String effectiveDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
private String expirationDate;
@@ -70,6 +73,9 @@
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "妯＄増ID")
+ private Long templateId;
+
private List<ContractPaymentSchedule> contractPaymentSchedule;
private List<ContractSubjectMatter> contractSubjectMatter;
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleVo.java
index cb265a6..9382bad 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleVo.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPaymentScheduleVo.java
@@ -42,6 +42,11 @@
@Schema(description = "鏀舵鐘舵�侊紙0-鏈敹娆� 1-閮ㄥ垎鏀舵 2-宸叉敹娆� 3-閫炬湡锛�")
private Integer paymentStatus;
- private List<ScheduleProcessVo> processVoList;
+ @Schema(description = "灞ョ害鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date processDate;
+ @Schema(description = "绾﹀畾澶╂暟")
+ private Integer agreedDays;
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
index 41126ca..b88aa1e 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -56,6 +57,7 @@
LambdaQueryWrapper<Contract> wrapper = Wrappers.lambdaQuery();
wrapper.like(StringUtils.isNotBlank(contract.getContractName()),Contract::getContractName,contract.getContractName());
wrapper.like(StringUtils.isNotBlank(contract.getPartyA()),Contract::getPartyA,contract.getPartyA());
+ wrapper.eq(ObjUtil.isNotNull(contract.getContractStatus()),Contract::getContractStatus,contract.getContractStatus());
wrapper.orderByDesc(BaseModel::getCreateTime);
return R.ok(contractService.pageByScope(page, wrapper));
}
@@ -127,15 +129,14 @@
}
/**
- * 閫氳繃id鍚堝悓鐢熸晥
+ * 鍚姩瀹℃牳娴佺▼
* @param id id
* @return R
*/
- @Operation(summary = "閫氳繃id鍚堝悓鐢熸晥" , description = "閫氳繃id鍚堝悓鐢熸晥" )
- @GetMapping("/takeEffect/{id}" )
- @PreAuthorize("@pms.hasPermission('business_contract_effect')" )
- public R takeEffect(@PathVariable("id" ) Long id) {
- return R.ok(contractService.takeEffect(id));
+ @Operation(summary = "閫氳繃id鍚姩瀹℃牳娴佺▼" , description = "閫氳繃id鍚堝悓鐢熸晥" )
+ @GetMapping("/startApproval/{id}" )
+ public R startApproval(@PathVariable("id" ) Long id) {
+ return contractService.startApproval(id);
}
@@ -148,4 +149,6 @@
public R genCurrentOverdue() {
return contractService.genCurrentOverdue();
}
+
+
}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractTemplateController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractTemplateController.java
new file mode 100644
index 0000000..1cca94b
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/ContractTemplateController.java
@@ -0,0 +1,127 @@
+package com.by4cloud.platformx.business.controller;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.log.annotation.SysLog;
+import com.by4cloud.platformx.business.entity.ContractTemplate;
+import com.by4cloud.platformx.business.service.ContractTemplateService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.by4cloud.platformx.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 鍚堝悓妯＄増
+ *
+ * @author syt
+ * @date 2026-05-15 14:13:59
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/contractTemplate" )
+@Tag(description = "contractTemplate" , name = "鍚堝悓妯＄増绠＄悊" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class ContractTemplateController {
+
+ private final ContractTemplateService contractTemplateService;
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page 鍒嗛〉瀵硅薄
+ * @param contractTemplate 鍚堝悓妯＄増
+ * @return
+ */
+ @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
+ @GetMapping("/page" )
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_view')" )
+ public R getContractTemplatePage(@ParameterObject Page page, @ParameterObject ContractTemplate contractTemplate) {
+ LambdaQueryWrapper<ContractTemplate> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(StrUtil.isNotBlank(contractTemplate.getTemplateName()),ContractTemplate::getTemplateName,contractTemplate.getTemplateName());
+ wrapper.orderByDesc(ContractTemplate::getCreateTime);
+ return R.ok(contractTemplateService.pageByScope(page, wrapper));
+ }
+
+
+ /**
+ * 閫氳繃id鏌ヨ鍚堝悓妯＄増
+ * @param id id
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鏌ヨ" , description = "閫氳繃id鏌ヨ" )
+ @GetMapping("/{id}" )
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_view')" )
+ public R getById(@PathVariable("id" ) Long id) {
+ return R.ok(contractTemplateService.getById(id));
+ }
+
+ /**
+ * 鏂板鍚堝悓妯＄増
+ * @param contractTemplate 鍚堝悓妯＄増
+ * @return R
+ */
+ @Operation(summary = "鏂板鍚堝悓妯＄増" , description = "鏂板鍚堝悓妯＄増" )
+ @SysLog("鏂板鍚堝悓妯＄増" )
+ @PostMapping
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_add')" )
+ public R save(@RequestBody ContractTemplate contractTemplate) {
+ return R.ok(contractTemplateService.save(contractTemplate));
+ }
+
+ /**
+ * 淇敼鍚堝悓妯＄増
+ * @param contractTemplate 鍚堝悓妯＄増
+ * @return R
+ */
+ @Operation(summary = "淇敼鍚堝悓妯＄増" , description = "淇敼鍚堝悓妯＄増" )
+ @SysLog("淇敼鍚堝悓妯＄増" )
+ @PutMapping
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_edit')" )
+ public R updateById(@RequestBody ContractTemplate contractTemplate) {
+ return R.ok(contractTemplateService.updateById(contractTemplate));
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎鍚堝悓妯＄増
+ * @param ids id鍒楄〃
+ * @return R
+ */
+ @Operation(summary = "閫氳繃id鍒犻櫎鍚堝悓妯＄増" , description = "閫氳繃id鍒犻櫎鍚堝悓妯＄増" )
+ @SysLog("閫氳繃id鍒犻櫎鍚堝悓妯＄増" )
+ @DeleteMapping
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_del')" )
+ public R removeById(@RequestBody Long[] ids) {
+ return R.ok(contractTemplateService.removeBatchByIds(CollUtil.toList(ids)));
+ }
+
+
+ /**
+ * 瀵煎嚭excel 琛ㄦ牸
+ * @param contractTemplate 鏌ヨ鏉′欢
+ * @param ids 瀵煎嚭鎸囧畾ID
+ * @return excel 鏂囦欢娴�
+ */
+ @ResponseExcel
+ @GetMapping("/export")
+ @PreAuthorize("@pms.hasPermission('business_contractTemplate_export')" )
+ public List<ContractTemplate> export(ContractTemplate contractTemplate,Long[] ids) {
+ return contractTemplateService.list(Wrappers.lambdaQuery(contractTemplate).in(ArrayUtil.isNotEmpty(ids), ContractTemplate::getId, ids));
+ }
+
+ @GetMapping("/listAll" )
+ public R listAll() {
+ return R.ok(contractTemplateService.listByScope(Wrappers.<ContractTemplate>lambdaQuery().orderByDesc(ContractTemplate::getCreateTime)));
+ }
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CurrentOverdueController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CurrentOverdueController.java
index 105d30e..3e359ad 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CurrentOverdueController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/CurrentOverdueController.java
@@ -53,6 +53,7 @@
LambdaQueryWrapper<CurrentOverdue> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotBlank(currentOverdue.getBusGuestName()),CurrentOverdue::getBusGuestName,currentOverdue.getBusGuestName());
wrapper.like(StrUtil.isNotBlank(currentOverdue.getContractName()),CurrentOverdue::getContractName,currentOverdue.getContractName());
+ wrapper.like(StrUtil.isNotBlank(currentOverdue.getScheduleName()),CurrentOverdue::getScheduleName,currentOverdue.getScheduleName());
wrapper.orderByDesc(CurrentOverdue::getCreateTime);
return R.ok(currentOverdueService.pageByScope(page, wrapper));
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java
new file mode 100644
index 0000000..ab70426
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/FlowCallBackController.java
@@ -0,0 +1,50 @@
+package com.by4cloud.platformx.business.controller;
+
+import com.by4cloud.platformx.business.constant.FlowNameEnum;
+import com.by4cloud.platformx.business.service.ContractService;
+import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
+import com.by4cloud.platformx.flow.task.dto.ProcessNodeRecordParamDto;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 宸ヤ綔娴佸洖璋�
+ * @author xfei
+ * @date 2025/5/12 17:07
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/flowCallBack" )
+@Slf4j
+@Tag(description = "flowCallBack" , name = "娴佺▼鍥炶皟" )
+public class FlowCallBackController {
+
+ private final ContractService contractService;
+
+ /**
+ * 寮�濮嬭妭鐐逛簨浠�
+ * @param recordParamDto
+ * @return
+ */
+ @PostMapping("/startNodeEvent")
+ public void startNodeEvent(@RequestBody ProcessNodeRecordParamDto recordParamDto){
+
+ }
+ /**
+ * 浠诲姟缁撴潫浜嬩欢
+ * @param processInstanceParamDto
+ * @return
+ */
+ @PostMapping("/endProcess")
+ public void endProcessEvent(@RequestBody ProcessInstanceParamDto processInstanceParamDto) {
+ if (processInstanceParamDto.getFlowName().equals(FlowNameEnum.鍚堝悓瀹℃壒.getName())) {
+ contractService.startApproval(Long.valueOf(processInstanceParamDto.getParamMap().get("id")+""));
+ }
+ }
+
+}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/HistoryOverdueController.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/HistoryOverdueController.java
index 2ec735c..9d68fc4 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/HistoryOverdueController.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/controller/HistoryOverdueController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.by4cloud.platformx.business.entity.CurrentOverdue;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.log.annotation.SysLog;
import com.by4cloud.platformx.business.entity.HistoryOverdue;
@@ -51,6 +52,7 @@
LambdaQueryWrapper<HistoryOverdue> wrapper = Wrappers.lambdaQuery();
wrapper.like(StrUtil.isNotBlank(historyOverdue.getBusGuestName()),HistoryOverdue::getBusGuestName,historyOverdue.getBusGuestName());
wrapper.like(StrUtil.isNotBlank(historyOverdue.getContractName()),HistoryOverdue::getContractName,historyOverdue.getContractName());
+ wrapper.like(StrUtil.isNotBlank(historyOverdue.getScheduleName()), HistoryOverdue::getScheduleName,historyOverdue.getScheduleName());
wrapper.orderByDesc(HistoryOverdue::getCreateTime);
return R.ok(historyOverdueService.pageByScope(page, wrapper));
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractTemplateMapper.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractTemplateMapper.java
new file mode 100644
index 0000000..b42641d
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/mapper/ContractTemplateMapper.java
@@ -0,0 +1,11 @@
+package com.by4cloud.platformx.business.mapper;
+
+import com.by4cloud.platformx.common.data.datascope.PlatformxBaseMapper;
+import com.by4cloud.platformx.business.entity.ContractTemplate;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface ContractTemplateMapper extends PlatformxBaseMapper<ContractTemplate> {
+
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
index d9eda69..66c72b7 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractService.java
@@ -19,7 +19,7 @@
ContractDetailVo detail(Long id);
- Boolean takeEffect(Long id);
+ R startApproval(Long id);
R genCurrentOverdue();
}
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractTemplateService.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractTemplateService.java
new file mode 100644
index 0000000..d6da498
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/ContractTemplateService.java
@@ -0,0 +1,9 @@
+package com.by4cloud.platformx.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.by4cloud.platformx.business.entity.ContractTemplate;
+import com.by4cloud.platformx.common.data.mybatis.IIService;
+
+public interface ContractTemplateService extends IIService<ContractTemplate> {
+
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
index dcc0047..be9ffc8 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractPaymentScheduleProcessServiceImpl.java
@@ -8,14 +8,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.business.dto.ContractPaymentScheduleProcessAddDTO;
-import com.by4cloud.platformx.business.entity.Contract;
-import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
-import com.by4cloud.platformx.business.entity.ContractPaymentScheduleProcess;
-import com.by4cloud.platformx.business.entity.PaymentConfirm;
-import com.by4cloud.platformx.business.mapper.ContractMapper;
-import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleMapper;
-import com.by4cloud.platformx.business.mapper.ContractPaymentScheduleProcessMapper;
-import com.by4cloud.platformx.business.mapper.PaymentConfirmMapper;
+import com.by4cloud.platformx.business.entity.*;
+import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.ContractPaymentScheduleProcessService;
import com.by4cloud.platformx.business.vo.ContractPaymentScheduleVo;
import com.by4cloud.platformx.business.vo.ScheduleProcessVo;
@@ -41,6 +35,7 @@
private final ContractPaymentScheduleMapper contractPaymentScheduleMapper;
private final ContractPaymentScheduleProcessMapper processMapper;
private final ContractMapper contractMapper;
+ private final ContractSubjectMatterMapper subjectMatterMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
@Override
@@ -51,6 +46,13 @@
}
//鍚堝悓
Contract contract = contractMapper.selectById(schedule.getContractId());
+ List<ContractSubjectMatter> subjectMatterList = subjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,contract.getId()));
+ if (ArrayUtil.isEmpty(subjectMatterList.toArray())){
+ return R.failed("璇ュ悎鍚屾爣鐨勭墿寮傚父锛岃鑱旂郴鎶�鏈汉鍛�");
+ }
+ if (!subjectMatterList.stream().allMatch(item->item.getDeliveryStatus()==2)){
+ return R.failed("鍑哄簱鏁伴噺灏忎簬褰撳墠鍚堝悓鏍囩殑鐗╂暟閲忥紝鏃犳硶杩涜褰撳墠鎿嶄綔");
+ }
//鏂板褰撳墠闃舵搴旀敹
PaymentConfirm currentConfim = new PaymentConfirm();
currentConfim.setBusinessType(schedule.getStageName()+"搴旀敹");
@@ -88,7 +90,7 @@
ContractPaymentSchedule beforeSchedule = contractPaymentScheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
if (ObjUtil.isNotNull(beforeSchedule)){
- beforeSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getProcessDate(),beforeSchedule.getAgreedDays()));
+ beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
contractPaymentScheduleMapper.updateById(beforeSchedule);
//涔嬪墠闃舵鏄惁鏀舵瀹屾垚
// if (beforeSchedule.getPaymentStatus()!=2){
@@ -166,6 +168,14 @@
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("鏃�");
contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
}
return R.ok();
}
@@ -176,20 +186,13 @@
.select(ContractPaymentSchedule::getId,ContractPaymentSchedule::getStageName,ContractPaymentSchedule::getEffectiveDate,
ContractPaymentSchedule::getPlannedAmount,ContractPaymentSchedule::getPlannedAmount,
ContractPaymentSchedule::getEffectiveEndDate,ContractPaymentSchedule::getPaymentDate,
- ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount)
+ ContractPaymentSchedule::getPaymentStatus,ContractPaymentSchedule::getActualAmount,
+ ContractPaymentSchedule::getAgreedDays)
+ .select(ContractPaymentScheduleProcess::getProcessDate)
+ .leftJoin(ContractPaymentScheduleProcess.class,ContractPaymentScheduleProcess::getScheduleId,ContractPaymentSchedule::getId)
.eq(ContractPaymentSchedule::getContractId,id)
.orderByAsc(ContractPaymentSchedule::getCreateTime);
List<ContractPaymentScheduleVo> scheduleVoList = contractPaymentScheduleMapper.selectJoinList(ContractPaymentScheduleVo.class,wrapper);
- if (ArrayUtil.isEmpty(scheduleVoList.toArray())){
- scheduleVoList.stream().forEach(contractPaymentScheduleVo -> {
- List<ContractPaymentScheduleProcess> paymentScheduleProcessList = processMapper.selectList(Wrappers.<ContractPaymentScheduleProcess>lambdaQuery()
- .eq(ContractPaymentScheduleProcess::getContractId,contractPaymentScheduleVo.getId())
- .orderByAsc(ContractPaymentScheduleProcess::getCreateTime));
- if (ArrayUtil.isNotEmpty(paymentScheduleProcessList.toArray())){
- contractPaymentScheduleVo.setProcessVoList(BeanUtil.copyToList(paymentScheduleProcessList, ScheduleProcessVo.class));
- }
- });
- }
return R.ok(scheduleVoList);
}
}
\ No newline at end of file
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 9f9e4bb..82307fb 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
@@ -7,6 +7,8 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
+import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
import com.by4cloud.platformx.business.dto.ContractUpdateDTO;
import com.by4cloud.platformx.business.entity.*;
@@ -16,6 +18,8 @@
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
+import com.by4cloud.platformx.flow.task.api.feign.RemoteBusinessService;
+import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -23,6 +27,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -39,6 +44,7 @@
private final ContractPaymentScheduleProcessMapper contractPaymentScheduleProcessMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
private final CurrentOverdueMapper currentOverdueMapper;
+ private final RemoteFlowProcessService remoteFlowProcessService;
@Override
public R add(ContractAddDTO addDTO) {
@@ -114,6 +120,14 @@
}
Contract contract = BeanUtil.copyProperties(updateDTO,Contract.class);
contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contract.setBillingStatus("0");
+ contract.setErpPushFlag("0");
+ List<Contract> contracts;
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+ while (ArrayUtil.isNotEmpty(contracts.toArray())){
+ contract.setContractNo(ContractNumberGenerator.generateContractNumber());
+ contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,contract.getContractNo()));
+ }
baseMapper.updateById(contract);
if (ArrayUtil.isNotEmpty(updateDTO.getContractSubjectMatter())){
@@ -135,12 +149,20 @@
AtomicInteger index = new AtomicInteger(1);
updateDTO.getContractPaymentSchedule().stream().forEach(contractPaymentScheduleAddDTO -> {
int currentIndex = index.getAndIncrement();
- ContractPaymentSchedule subjectMatter = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
- subjectMatter.setContractId(contract.getId());
- subjectMatter.setContractName(contract.getContractName());
- subjectMatter.setPlannedAmount(contract.getAmount().multiply(subjectMatter.getPaymentRatio().divide(new BigDecimal("100"))));
- subjectMatter.setStageOrder(currentIndex);
- contractPaymentScheduleMapper.insert(subjectMatter);
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentScheduleAddDTO, ContractPaymentSchedule.class);
+ 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);
+ }
});
}
@@ -160,7 +182,23 @@
}
@Override
- public Boolean takeEffect(Long id) {
+ public R startApproval(Long id) {
+ Contract contract = baseMapper.selectById(id);
+ //鍚姩娴佺▼
+ 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("娴佺▼鍚姩澶辫触");
+ }
+ contract.setContractStatus(2);
+ baseMapper.updateById(contract);
+ return R.ok();
+ }
+
+ public void takeEffect(Long id) {
Contract contract = baseMapper.selectById(id);
contract.setContractStatus(1);
baseMapper.updateById(contract);
@@ -181,6 +219,13 @@
paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
paymentConfirm.setTotalAmount(fitstSchedule.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()));
paymentConfirmMapper.insert(paymentConfirm);
//鏂板鍚堝悓灞ョ害璁板綍
ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
@@ -190,6 +235,49 @@
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 (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 {
+ //鏂板搴旀敹
+ PaymentConfirm paymentConfirm = new PaymentConfirm();
+ paymentConfirm.setBusinessType("璐ㄤ繚閲�");
+ paymentConfirm.setBusGuestId(contract.getPartyAId());
+ paymentConfirm.setBusGuestName(contract.getPartyA());
+ paymentConfirm.setContractId(contract.getId());
+ paymentConfirm.setContractName(contract.getContractName());
+ paymentConfirm.setContractNo(contract.getContractNo());
+ paymentConfirm.setScheduleId(fitstSchedule.getId());
+ paymentConfirm.setScheduleName(fitstSchedule.getStageName());
+ paymentConfirm.setConfirmTime(new Date());
+ paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
+ paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
+ paymentConfirm.setTotalAmount(fitstSchedule.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()));
+ paymentConfirmMapper.insert(paymentConfirm);
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
@@ -204,7 +292,7 @@
endSchedule.setEffectiveEndDate(contract.getExpirationDate());
contractPaymentScheduleMapper.updateById(endSchedule);
//绗竴闃舵鐢熸晥鏃堕棿
- fitstSchedule.setEffectiveDate(DateUtil.offsetDay(new Date(),fitstSchedule.getAgreedDays()));
+ fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
fitstSchedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
contractPaymentScheduleMapper.updateById(fitstSchedule);
@@ -235,18 +323,19 @@
baseMapper.updateById(contract);
}
if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
+ //绗竴闃舵鐢熸晥鏃堕棿
+ fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
+ contractPaymentScheduleMapper.updateById(fitstSchedule);
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(afterSchedule.get(0).getStageName());
baseMapper.updateById(contract);
}
+ //鍙湁褰撳墠鍚堝悓绛惧瓧闃舵
if(ArrayUtil.isEmpty(afterSchedule.toArray())){
+ fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
fitstSchedule.setEffectiveEndDate(contract.getExpirationDate());
contractPaymentScheduleMapper.updateById(fitstSchedule);
- //鏇存柊鍚堝悓涓嬩釜闃舵
- contract.setNextScheduleName("鏃�");
- baseMapper.updateById(contract);
}
- return Boolean.TRUE;
}
@Override
@@ -281,6 +370,7 @@
PaymentConfirm oiverdueConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getScheduleId, contractPaymentSchedule.getId())
.eq(PaymentConfirm::getBusinessType, "搴旀敹瓒呮湡"));
if (ObjUtil.isNull(oiverdueConfirm)) {
+ overdueConfirm.setCompId(contractPaymentSchedule.getCompId());
paymentConfirmMapper.insert(overdueConfirm);
}
//褰撳墠閫炬湡
@@ -299,6 +389,7 @@
CurrentOverdue overdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getContractId,currentOverdue.getContractId())
.eq(CurrentOverdue::getScheduleId,currentOverdue.getScheduleId()).last("limit 1"));
if (ObjUtil.isNull(overdue)){
+ currentOverdue.setCompId(contractPaymentSchedule.getCompId());
currentOverdueMapper.insert(currentOverdue);
}else {
overdue.setOverdueDuration(BigDecimal.valueOf(DateUtil.betweenDay(contractPaymentSchedule.getEffectiveEndDate(),new Date(),true)));
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractTemplateServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractTemplateServiceImpl.java
new file mode 100644
index 0000000..2f98855
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractTemplateServiceImpl.java
@@ -0,0 +1,16 @@
+package com.by4cloud.platformx.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.business.entity.ContractTemplate;
+import com.by4cloud.platformx.business.mapper.ContractTemplateMapper;
+import com.by4cloud.platformx.business.service.ContractTemplateService;
+import org.springframework.stereotype.Service;
+/**
+ * 鍚堝悓妯＄増
+ *
+ * @author syt
+ * @date 2026-05-15 14:13:59
+ */
+@Service
+public class ContractTemplateServiceImpl extends ServiceImpl<ContractTemplateMapper, ContractTemplate> implements ContractTemplateService {
+}
\ No newline at end of file
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 98b4924..252dee9 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -19,10 +19,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -50,7 +47,7 @@
MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
.selectAll(ContractSubjectMatter.class)
.ne(ContractSubjectMatter::getDeliveryStatus, 2)
- .in(ContractSubjectMatter::getMaterialCode,addDTO.getSubjectMatterList().stream().map(item->item.getSubjectMatterCode()).collect(Collectors.toList()))
+ .in(ContractSubjectMatter::getMaterialCode, addDTO.getSubjectMatterList().stream().map(item -> item.getSubjectMatterCode()).collect(Collectors.toList()))
.exists(Contract.class, contractQuery ->
contractQuery.select(ContractSubjectMatter::getId)
.eq(Contract::getId, ContractSubjectMatter::getContractId)
@@ -78,64 +75,67 @@
return R.failed("鍑哄簱鏁伴噺瓒呭嚭鍚堝悓璁㈠崟鏁伴噺");
}
//褰撳墠鍏ュ簱鏍囩殑鐗�
- List<ContractSubjectMatter> currentOutList = new ArrayList<>();
+ Map<Long, Object> currentOutMap = new HashMap<>();
+ //鍑哄簱
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
BigDecimal remainNum = outSubjectMatterAddDTO.getOutBoundNum();
for (ContractSubjectMatter subjectMatter : subjectMatterList) {
- Contract contract = contractMapper.selectById(subjectMatter.getContractId());
- if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
- remainNum = remainNum.subtract(subjectMatter.getRemainingQuantity());
- //閮ㄥ垎浜や粯鐘舵�佷笅 鍏ㄩ儴鍑哄簱
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
- BigDecimal currentOut = subjectMatter.getRemainingQuantity();
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
- subjectMatter.setRemainingQuantity(new BigDecimal("0"));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(2);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- //鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract,addDTO,subjectMatter);
- } else {
- BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
- subjectMatter.setRemainingQuantity(subjectMatter.getRemainingQuantity().subtract(currentOut));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(1);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- //鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract,addDTO,subjectMatter);
- break;
- }
+ if (outSubjectMatterAddDTO.getSubjectMatterCode().equals(subjectMatter.getMaterialCode())) {
+ Contract contract = contractMapper.selectById(subjectMatter.getContractId());
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+ remainNum = remainNum.subtract(subjectMatter.getRemainingQuantity());
+ //閮ㄥ垎浜や粯鐘舵�佷笅 鍏ㄩ儴鍑哄簱
+ if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ BigDecimal currentOut = subjectMatter.getRemainingQuantity();
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(2);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter);
+ } else {
+ BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
+ subjectMatter.setRemainingQuantity(subjectMatter.getRemainingQuantity().subtract(currentOut));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(1);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter);
+ break;
+ }
- } else {
- //鏈氦浠樼姸鎬佷笅
- remainNum = remainNum.subtract(subjectMatter.getQuantity());
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
- subjectMatter.setRemainingQuantity(new BigDecimal("0"));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(2);
- subjectMatter.setLastDeliveredQuantity(subjectMatter.getQuantity());
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- //鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract,addDTO,subjectMatter);
} else {
- BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
- subjectMatter.setRemainingQuantity(remainNum.multiply(new BigDecimal("-1")));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(1);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- //鏂板鍚堝悓鍑哄簱鍘嗗彶
- saveContractOutBound(contract,addDTO,subjectMatter);
- break;
+ //鏈氦浠樼姸鎬佷笅
+ remainNum = remainNum.subtract(subjectMatter.getQuantity());
+ if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(2);
+ subjectMatter.setLastDeliveredQuantity(subjectMatter.getQuantity());
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter);
+ } else {
+ BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
+ subjectMatter.setRemainingQuantity(remainNum.multiply(new BigDecimal("-1")));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(1);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter);
+ break;
+ }
}
}
}
@@ -147,32 +147,32 @@
});
//鍑哄簱搴旀敹娆炬槑缁�
- if (ArrayUtil.isNotEmpty(currentOutList.toArray())) {
- //鏍规嵁鍚堝悓id鎷嗗垎搴旀敹鏄庣粏
- Map<Long, List<ContractSubjectMatter>> conSubMatMap = currentOutList.stream().collect(Collectors.groupingBy(ContractSubjectMatter::getContractId));
-
- conSubMatMap.forEach((key, value) -> {
+ if (ArrayUtil.isNotEmpty(currentOutMap.keySet())) {
+ for (Long contractId : currentOutMap.keySet()) {
+ //褰撳墠鍑哄簱鍚堝悓鍑哄簱鏍囩殑鐗�
+ List<ContractSubjectMatter> contractSubjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, contractId).ne(ContractSubjectMatter::getDeliveryStatus, 0));
//鏌ヨ鍚堝悓鏄惁鏈夊嚭搴撻樁娈�
- ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, key)
+ ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractId)
.eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�"));
- //褰撳墠鍑哄簱閲戦
- BigDecimal outPirce = value.stream()
- .filter(item -> item.getLastDeliveredQuantity() != null && item.getUnitPrice() != null)
- .map(item ->(item.getDeliveryStatus()==1?item.getDeliveredQuantity():item.getQuantity()).multiply(item.getUnitPrice()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- //鍚堝悓閲戦
- Contract contract = contractMapper.selectById(key);
- //鍑哄簱鏄惁瀹屾垚
- if (outPirce.compareTo(contract.getAmount())<0){
- contract.setBillingStatus("1");
- contractMapper.updateById(contract);
- }
- if (outPirce.compareTo(contract.getAmount())==0){
- contract.setBillingStatus("2");
- contractMapper.updateById(contract);
- }
+ //瀛樺湪鍑哄簱闃舵
if (ObjUtil.isNotNull(schedule)) {
- //鎸夊嚭搴撹祫閲戞瘮渚� 璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
+ //褰撳墠鍑哄簱閲戦
+ BigDecimal outPirce = contractSubjectMatterList.stream()
+ .map(item -> (item.getDeliveryStatus() == 1 ? item.getDeliveredQuantity().multiply(item.getUnitPrice()) : item.getQuantity().multiply(item.getUnitPrice())))
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鍚堝悓閲戦
+ Contract contract = contractMapper.selectById(contractId);
+ //鍑哄簱鏄惁瀹屾垚
+ if (outPirce.compareTo(contract.getAmount()) < 0) {
+ contract.setBillingStatus("1");
+ contractMapper.updateById(contract);
+ }
+ if (outPirce.compareTo(contract.getAmount()) == 0) {
+ contract.setBillingStatus("2");
+ contractMapper.updateById(contract);
+ }
+ //璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
PaymentConfirm paymentConfirm = new PaymentConfirm();
paymentConfirm.setBusinessType("鍙戣揣鍓嶅簲鏀�");
paymentConfirm.setBusGuestId(contract.getPartyAId());
@@ -183,53 +183,74 @@
paymentConfirm.setScheduleId(schedule.getId());
paymentConfirm.setScheduleName(schedule.getStageName());
paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
+ //鎸夊嚭搴撹祫閲戞瘮渚� 璁＄畻鍙戣揣鍓嶅簲鏀�
paymentConfirm.setTransationAmount(outPirce.divide(contract.getAmount(), 10, RoundingMode.HALF_UP).multiply(schedule.getPlannedAmount()));
paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
- paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
+
//鏈�杩戝簲鏀�
PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+
if (ObjUtil.isNotNull(lastConfirm)) {
- paymentConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(lastConfirm.getTotalAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ //宸插瓨鍦ㄥ彂璐у簲鏀�
+ if (StrUtil.equals(lastConfirm.getBusinessType(), paymentConfirm.getBusinessType())) {
+
+ //鏌ヨ涔嬪墠鎵�鏈夊彂璐у墠搴旀敹
+ List<PaymentConfirm> fhConfirmList = paymentConfirmMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .eq(PaymentConfirm::getScheduleId,schedule.getId()).orderByDesc(PaymentConfirm::getCreateTime));
+ BigDecimal fhTotalAmount = fhConfirmList.stream().map(item->item.getTransationAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ //鏈鍙戣揣鍓嶅簲鏀� 鍑哄簱鎬婚 - 鎵�鏈夊彂璐у墠搴旀敹
+ paymentConfirm.setTransationAmount(paymentConfirm.getTransationAmount().subtract(fhTotalAmount));
+ paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
+ paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
+ paymentConfirmMapper.insert(paymentConfirm);
+ } else {
+ //涓嶅瓨鍦ㄥ彂璐у簲鏀� 鍑哄簱鎬婚
+ paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
} else {
+ //鏃犱箣鍓嶉樁娈靛簲鏀�
+ paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
paymentConfirmMapper.insert(paymentConfirm);
}
+
//鏇存柊鍙戣揣鍓嶆敹娆剧敓鏁堟椂闂�
- if (ObjUtil.isNull(schedule.getEffectiveDate())){
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),schedule.getAgreedDays()));
+ if (ObjUtil.isNull(schedule.getEffectiveDate())) {
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), schedule.getAgreedDays()));
//鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, key)
+ List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractId)
.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isEmpty(afterSchedule.toArray())){
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
schedule.setEffectiveEndDate(contract.getExpirationDate());
}
scheduleMapper.updateById(schedule);
//鏌ヨ鏄惁鏈変箣鍓嶉樁娈�
ContractPaymentSchedule beforeSchedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(beforeSchedule)){
- beforeSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),beforeSchedule.getAgreedDays()));
+ if (ObjUtil.isNotNull(beforeSchedule)) {
+ beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
scheduleMapper.updateById(beforeSchedule);
}
+ //鏇存柊灞ョ害
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
+ contractPaymentScheduleProcess.setContractId(schedule.getContractId());
+ contractPaymentScheduleProcess.setContractName(schedule.getContractName());
+ contractPaymentScheduleProcess.setScheduleId(schedule.getId());
+ contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
+ contractPaymentScheduleProcess.setProcessDate(addDTO.getOutBoundTime());
+ scheduleProcessMapper.insert(contractPaymentScheduleProcess);
}
- //鏇存柊灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
- contractPaymentScheduleProcess.setContractId(schedule.getContractId());
- contractPaymentScheduleProcess.setContractName(schedule.getContractName());
- contractPaymentScheduleProcess.setScheduleId(schedule.getId());
- contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- contractPaymentScheduleProcess.setProcessDate(addDTO.getOutBoundTime());
- scheduleProcessMapper.insert(contractPaymentScheduleProcess);
+
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
.orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
//鏈�鍚庨樁娈电敓鏁堟椂闂�
ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- if (StrUtil.equals(endSchedule.getStageName(),"璐ㄤ繚閲�")) {
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), endSchedule.getAgreedDays()));
endSchedule.setEffectiveEndDate(contract.getExpirationDate());
scheduleMapper.updateById(endSchedule);
@@ -263,20 +284,28 @@
contract.setNextScheduleName(endSchedule.getStageName());
contractMapper.updateById(contract);
}
- if(ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()>1){
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName(afterSchedule.get(0).getStageName());
contractMapper.updateById(contract);
}
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
schedule.setEffectiveEndDate(contract.getExpirationDate());
scheduleMapper.updateById(schedule);
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("鏃�");
contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+ //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+ contract.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
}
}
- });
+ }
}
return R.ok();
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
index 8451ea7..41635d1 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/PaymentConfirmServiceImpl.java
@@ -98,6 +98,7 @@
if (ArrayUtil.isNotEmpty(scheduleList.toArray())){
BigDecimal remain = addDTO.getTransationAmount();
for (ContractPaymentSchedule schedule:scheduleList) {
+ BigDecimal lastRemain = remain;
remain = remain.subtract(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount():
schedule.getPlannedAmount().subtract(schedule.getActualAmount()));
if (remain.compareTo(new BigDecimal("0"))>=0){
@@ -112,16 +113,34 @@
//鏂板閫炬湡鍘嗗彶
HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+ historyOverdue.setCompId(schedule.getCompId());
historyOverdueMapper.insert(historyOverdue);
//鍒犻櫎褰撳墠閫炬湡
currentOverdueMapper.deleteById(currentOverdue);
}
}else {
schedule.setActualAmount(StrUtil.equals(schedule.getPaymentStatus()+"","0")?schedule.getPlannedAmount().add(remain):
- schedule.getPlannedAmount().subtract(schedule.getActualAmount()).add(remain));
+ schedule.getActualAmount().add(lastRemain));
schedule.setPaymentDate(addDTO.getConfirmTime());
schedule.setPaymentStatus(1);
contractPaymentScheduleMapper.updateById(schedule);
+ //鏌ヨ鏄惁鏈夊綋鍓嶉�炬湡
+ CurrentOverdue currentOverdue = currentOverdueMapper.selectOne(Wrappers.<CurrentOverdue>lambdaQuery().eq(CurrentOverdue::getScheduleId,schedule.getId())
+ .eq(CurrentOverdue::getContractId,schedule.getContractId()).last("limit 1"));
+ if (ObjUtil.isNotNull(currentOverdue)){
+ //鏂板閫炬湡鍘嗗彶
+ HistoryOverdue historyOverdue = BeanUtil.copyProperties(currentOverdue,HistoryOverdue.class,"id");
+ historyOverdue.setReceivableAmount(lastRemain);
+ historyOverdue.setPaymentTime(addDTO.getConfirmTime());
+ historyOverdue.setCompId(schedule.getCompId());
+ historyOverdueMapper.insert(historyOverdue);
+ //鏌ヨ鍘嗗彶宸蹭粯閫炬湡閲戦
+ List<HistoryOverdue> historyOverdueList = historyOverdueMapper.selectList(Wrappers.<HistoryOverdue>lambdaQuery().eq(HistoryOverdue::getScheduleId,currentOverdue.getScheduleId()));
+ BigDecimal hisTotal = historyOverdueList.stream().map(item->item.getReceivableAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ //鏇存柊褰撳墠閫炬湡
+ currentOverdue.setReceivableAmount(schedule.getPlannedAmount().subtract(hisTotal));
+ currentOverdueMapper.updateById(currentOverdue);
+ }
break;
}
}
diff --git a/platformx-business-finance-biz/src/main/resources/mapper/ContractTemplateMapper.xml b/platformx-business-finance-biz/src/main/resources/mapper/ContractTemplateMapper.xml
new file mode 100644
index 0000000..49d31eb
--- /dev/null
+++ b/platformx-business-finance-biz/src/main/resources/mapper/ContractTemplateMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.by4cloud.platformx.business.mapper.ContractTemplateMapper">
+
+ <resultMap id="contractOutBoundMap" type="com.by4cloud.platformx.business.entity.ContractTemplate">
+ <id property="id" column="id"/>
+ <result property="compId" column="comp_id"/>
+ <result property="templateName" column="template_name"/>
+ <result property="templatePath" column="contract_path"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="delFlag" column="del_flag"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1