diff --git a/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/dto/HcsClaimRecordAddDTO.java b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/dto/HcsClaimRecordAddDTO.java new file mode 100644 index 00000000..8185a17c --- /dev/null +++ b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/dto/HcsClaimRecordAddDTO.java @@ -0,0 +1,102 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *
+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *
+ * 1. This software is for development use only under a valid license + * from BladeX. + *
+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *
+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *
+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *
+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *
+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.hcs.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 合同合规系统(HCS)C107-1 新增认领记录入参(将收款流水认领到合同/履约项) + *
+ * 校验:fdCollectionFlow.fdId、fdContractNumber(须在合规本地存在)、fdClaimAmount 必填, + * 认领金额必须大于 0 且不能超过该流水收款金额;fdExePlanStageId 可选,若传须属于该合同。 + * + * @author Chill + */ +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonIgnoreProperties(ignoreUnknown = true) +public class HcsClaimRecordAddDTO implements Serializable { + @Serial + private static final long serialVersionUID = 1L; + /** + * 收款流水(fdId 必填,为合规系统流水ID) + */ + private HcsRefVO fdCollectionFlow; + /** + * 认领合同 {fdId, fdName}(fdId 为合规合同ID,随编号一并回溯) + */ + private HcsRefVO fdContract; + /** + * 认领合同编号(必填,须在合规系统本地存在) + */ + private String fdContractNumber; + /** + * 对应履约项ID(可选,须属于该合同) + */ + private String fdExePlanStageId; + /** + * 认领款项类型(prepayment=预付款,progress=进度款,acceptance=验收款,retention=质保金) + */ + private String fdFundNature; + /** + * 认领人 {fdId, fdName} + */ + private HcsRefVO fdClaimer; + /** + * 认领人名称 + */ + private String fdClaimerName; + /** + * 认领人部门 {fdId, fdName} + */ + private HcsRefVO fdClaimerDept; + /** + * 认领人部门名称 + */ + private String fdClaimerDeptName; + /** + * 认领金额(必填,必须大于0,且不能超过收款金额) + */ + private BigDecimal fdClaimAmount; + /** + * 认领日期(毫秒时间戳) + */ + private Long fdClaimDate; + /** + * 备注 + */ + private String fdRemark; + /** + * 状态:0=已认领(默认),1=已作废 + */ + private Integer fdStatus; +} diff --git a/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/feign/IHcsClient.java b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/feign/IHcsClient.java index d5a617ee..a119b917 100644 --- a/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/feign/IHcsClient.java +++ b/blade-third-party-api/blade-hcs-api/src/main/java/org/springblade/hcs/feign/IHcsClient.java @@ -30,6 +30,7 @@ import org.springblade.hcs.config.HcsFeignClientConfig; import org.springblade.hcs.dto.HcsAttachmentDownloadDTO; import org.springblade.hcs.dto.HcsAttachmentVO; import org.springblade.hcs.dto.HcsCategoryVO; +import org.springblade.hcs.dto.HcsClaimRecordAddDTO; import org.springblade.hcs.dto.HcsContractDetailQueryDTO; import org.springblade.hcs.dto.HcsContractDetailVO; import org.springblade.hcs.dto.HcsContractDraftDTO; @@ -66,7 +67,7 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; /** - * 合同合规系统(HCS)接口(一期 24 个业务接口,D4) + * 合同合规系统(HCS)接口(一期 25 个业务接口,D4) *
* v4 接口说明:认证统一由 {@link org.springblade.hcs.interceptor.HcsAuthInterceptor} 注入
* Authorization + Key-Auth 两个静态请求头,不再调用 getToken 取令牌;
@@ -105,6 +106,7 @@ public interface IHcsClient {
String INVOICE_REG_LIST_URL = "${thirdParty.hcs.invoiceRegListUrl:/openapi/eop-data/eopDataInvoiceRegistrationOpen/list}";
String INVOICE_REG_ADD_URL = "${thirdParty.hcs.invoiceRegAddUrl:/openapi/eop-data/eopDataInvoiceRegistrationOpen/add}";
String INVOICE_REG_UPDATE_URL = "${thirdParty.hcs.invoiceRegUpdateUrl:/openapi/eop-data/eopDataInvoiceRegistrationOpen/update}";
+ String CLAIM_RECORD_ADD_URL = "${thirdParty.hcs.claimRecordAddUrl:/openapi/eop-data/eopDataCollectionFlowClaimRecordOpen/add}";
/**
* C102-1 项目立项新建
@@ -327,4 +329,13 @@ public interface IHcsClient {
*/
@PostMapping(INVOICE_REG_UPDATE_URL)
HcsResult