Merge remote-tracking branch 'origin/master' into feature/hcs-api-p0

# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ContractManageServiceImpl.java # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java
2026-10-23 19:18:33 +08:00
parent 464e83fcf1 49c149c675
commit 05ab35d5c9
85 changed files with 2415 additions and 354 deletions
@@ -26,6 +26,10 @@ public class FormalSettlementSaveRequest implements Serializable {
 	private List<Long> sourcePreSettlementIds;
 	private List<Long> sourceDetailIds;
 	private List<DetailAdjustment> detailAdjustments;
+	/** 业务模式（业务字典 business_model） */
+	private String businessModel;
+	/** 运输方式（业务字典 transport_type） */
+	private String transportType;
 	private LocalDate exchangeRateDate;
 	private BigDecimal exchangeRate;
 	private String attachmentsJson;
@@ -55,6 +55,12 @@ public class PreSettlementSaveRequest implements Serializable {
 	@Schema(description = "结算类型：receivable/payable")
 	private String settlementType;

+	@Schema(description = "业务模式（业务字典 business_model）")
+	private String businessModel;
+
+	@Schema(description = "运输方式（业务字典 transport_type）")
+	private String transportType;
+
 	@Schema(description = "汇率日期")
 	private LocalDate exchangeRateDate;

@@ -199,6 +199,10 @@ public class ContractManage extends TenantEntity {
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private String changeContent;

+	@TableField(exist = false)
+	@Schema(description = "变更类型")
+	private String changeType;
+
 	@Schema(description = "变更原因")
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private String changeReason;
@@ -32,6 +32,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;

 import java.io.Serial;
+import java.math.BigDecimal;

 /**
 * 评分量化表实体类
@@ -62,5 +63,10 @@ public class CreditScoreQuantification extends TenantEntity {
 	 */
 	@Schema(description = "标准说明")
 	private String standardDescription;
+	/**
+	 * 减分项目最高扣分限制：客商评分时所有减分项合计不得超过该值，超出按该上限计分
+	 */
+	@Schema(description = "减分项目最高扣分限制")
+	private BigDecimal maxMinusScore;

 }
@@ -115,6 +115,10 @@ public class CustomerArchive extends TenantEntity {
 	@Schema(description = "营业期限类型")
 	private String businessTermType;

+	@Schema(description = "营业期限开始日")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private LocalDate businessStartDate;
+
 	@Schema(description = "营业期限截止日")
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private LocalDate businessEndDate;
@@ -123,6 +127,10 @@ public class CustomerArchive extends TenantEntity {
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private BigDecimal registeredCapital;

+	@Schema(description = "实缴资本(万元)")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private BigDecimal paidInCapital;
+
 	@Schema(description = "客商负责人")
 	private String principal;

@@ -140,6 +148,10 @@ public class CustomerArchive extends TenantEntity {
 	@TableField(updateStrategy = FieldStrategy.ALWAYS)
 	private BigDecimal applyCreditLimit;

+	@Schema(description = "已使用额度(万元)，新建可录历史值，后续由收付款业务累加/减更新")
+	@TableField(updateStrategy = FieldStrategy.ALWAYS)
+	private BigDecimal usedCreditLimit;
+
 	@Schema(description = "备注")
 	private String remark;

@@ -88,6 +88,14 @@ public class FormalSettlement extends TenantEntity {
 	 * 结算金额（结算币种，含全部合计费用）
 	 */
 	private BigDecimal settlementAmount;
+	/**
+	 * 业务模式（业务字典 business_model）
+	 */
+	private String businessModel;
+	/**
+	 * 运输方式（业务字典 transport_type）
+	 */
+	private String transportType;
 	/**
 	 * 本位币，默认 RMB
 	 */
@@ -92,6 +92,12 @@ public class PreSettlement extends TenantEntity {
 	@Schema(description = "结算金额")
 	private BigDecimal settlementAmount;

+	@Schema(description = "业务模式（业务字典 business_model）")
+	private String businessModel;
+
+	@Schema(description = "运输方式（业务字典 transport_type）")
+	private String transportType;
+
 	@Schema(description = "本位币")
 	private String localCurrency;

@@ -29,6 +29,7 @@ import lombok.EqualsAndHashCode;
 import org.springblade.transport.pojo.entity.CustomerCreditScore;

 import java.io.Serial;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;

@@ -57,4 +58,11 @@ public class CustomerCreditScoreVO extends CustomerCreditScore {
 	@Schema(description = "评估标准")
 	private List<CreditRatingStandardVO> standards = new ArrayList<>();

+	/**
+	 * 来自评分量化表的减分项目最高扣分限制（非落库字段，供前端计分使用）
+	 */
+	@TableField(exist = false)
+	@Schema(description = "减分项目最高扣分限制")
+	private BigDecimal maxMinusScore;
+
 }
@@ -43,6 +43,8 @@ public class FormalSettlementVO extends FormalSettlement implements KingdeeUnloc
 	@TableField(exist = false) private String ids;
 	@TableField(exist = false) private String approvalStatusName;
 	@TableField(exist = false) private String settlementTypeName;
+	@TableField(exist = false) @Schema(description = "业务模式名称") private String businessModelName;
+	@TableField(exist = false) @Schema(description = "运输方式名称") private String transportTypeName;
 	@TableField(exist = false) private Integer attachmentCount;
 	@TableField(exist = false) private String attachmentSyncStatus;
 	@TableField(exist = false) private String attachmentSyncStatusName;
@@ -85,6 +85,14 @@ public class PreSettlementVO extends PreSettlement {
 	@Schema(description = "结算类型名称")
 	private String settlementTypeName;

+	@TableField(exist = false)
+	@Schema(description = "业务模式名称")
+	private String businessModelName;
+
+	@TableField(exist = false)
+	@Schema(description = "运输方式名称")
+	private String transportTypeName;
+
 	@TableField(exist = false)
 	@Schema(description = "结算明细")
 	private List<PreSettlementDetail> details;
@@ -56,6 +56,9 @@ public class TripQueryVO implements Serializable {
 	@Schema(description = "可见组织 ID 集合：非空时只出这些组织的运单行，空集合表示不按组织过滤")
 	private List<Long> deptIds;

+	@Schema(description = "可见项目 ID 集合：非空时只出这些项目的运单行，空集合表示不按项目过滤（小程序调度端优先用此口径）")
+	private List<Long> projectIds;
+
 	@Schema(description = "状态：0待接单/1进行中/2已完成/3已取消，不传为全部（不含已取消）")
 	private Integer status;