✨ 合同支持甲乙丙多方客商及分客商计费

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-02 16:46:31 +08:00
parent 0b2348f8fc
commit 91dddd0e02
16 changed files with 930 additions and 66 deletions
@@ -103,6 +103,18 @@ public class ContractChange extends TenantEntity {
 	@Schema(description = "乙方")
 	private String partyB;

+	@Schema(description = "甲方客商明细JSON")
+	private String partyAJson;
+
+	@Schema(description = "乙方客商明细JSON")
+	private String partyBJson;
+
+	@Schema(description = "丙方客商明细JSON")
+	private String partyCJson;
+
+	@Schema(description = "丙方")
+	private String partyC;
+
 	@Schema(description = "开始日期")
 	private LocalDate startDate;

@@ -79,6 +79,18 @@ public class ContractManage extends TenantEntity {
 	@Schema(description = "乙方")
 	private String partyB;

+	@Schema(description = "甲方客商明细JSON")
+	private String partyAJson;
+
+	@Schema(description = "乙方客商明细JSON")
+	private String partyBJson;
+
+	@Schema(description = "丙方客商明细JSON")
+	private String partyCJson;
+
+	@Schema(description = "丙方")
+	private String partyC;
+
 	@Schema(description = "开始日期")
 	private LocalDate startDate;

@@ -86,6 +86,12 @@ public class LoadingManage extends TenantEntity {
 	@Schema(description = "承运商合同ID")
 	private Long carrierContractId;

+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
 	@Schema(description = "发货地址")
 	private String departureAddress;

@@ -136,6 +136,12 @@ public class Waybill extends TenantEntity {
 	@Schema(description = "承运商合同ID")
 	private Long carrierContractId;

+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
 	@Schema(description = "司机ID")
 	private Long driverId;

@@ -55,4 +55,17 @@ public class LoadingCarrierContractVO implements Serializable {
 	@Schema(description = "承运商名称")
 	private String carrierName;

+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
+	@Schema(description = "统一信用代码")
+	private String creditCode;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "客商档案ID")
+	private Long customerId;
+
 }
@@ -34,4 +34,17 @@ public class MasterOrderCarrierVO implements Serializable {
 	@Schema(description = "承运商名称")
 	private String carrierName;

+	@Schema(description = "承运客商明细行ID")
+	private String carrierPartyId;
+
+	@Schema(description = "承运客商角色：B/C")
+	private String carrierPartyRole;
+
+	@Schema(description = "统一信用代码")
+	private String creditCode;
+
+	@JsonSerialize(using = ToStringSerializer.class)
+	@Schema(description = "客商档案ID")
+	private Long customerId;
+
 }