调整预结算、正式结算

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/FormalSettlementSaveRequest.java

@@ -28,4 +28,16 @@ public class FormalSettlementSaveRequest implements Serializable {
 	private BigDecimal exchangeRate;
 	private String attachmentsJson;
 	private String remark;
+	private List<SummaryFee> summaryFees;
+
+	@Data
+	public static class SummaryFee implements Serializable {
+		@Serial private static final long serialVersionUID = 1L;
+		private Long id;
+		private String feeType;
+		private String feeItem;
+		private BigDecimal adjustAmount;
+		private String remark;
+		private Integer manualFlag;
+	}
 }

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/CommonRoute.java

@@ -57,6 +57,15 @@ public class CommonRoute extends TenantEntity {
 	@Schema(description = "发货地")
 	private String departureName;
 
+	@Schema(description = "发货省ID")
+	private String departureProvinceId;
+
+	@Schema(description = "发货市ID")
+	private String departureCityId;
+
+	@Schema(description = "发货区ID")
+	private String departureDistrictId;
+
 	@Schema(description = "发货地址")
 	private String departureAddress;
 
@@ -78,6 +87,15 @@ public class CommonRoute extends TenantEntity {
 	@Schema(description = "收货地")
 	private String arrivalName;
 
+	@Schema(description = "收货省ID")
+	private String arrivalProvinceId;
+
+	@Schema(description = "收货市ID")
+	private String arrivalCityId;
+
+	@Schema(description = "收货区ID")
+	private String arrivalDistrictId;
+
 	@Schema(description = "收货地址")
 	private String arrivalAddress;
 

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/FormalSettlementSummaryFee.java

@@ -0,0 +1,40 @@
+/**
+ * BladeX Commercial License Agreement
+ * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved.
+ * <p>
+ * Use of this software is governed by the Commercial License Agreement obtained after purchasing a license from BladeX.
+ * <p>
+ * Author: Chill Zhuang (bladejava@qq.com)
+ */
+package org.springblade.transport.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+import java.io.Serial;
+import java.math.BigDecimal;
+
+/**
+ * 正式结算合计费用实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("blade_formal_settlement_summary_fee")
+@Schema(description = "正式结算合计费用")
+public class FormalSettlementSummaryFee extends TenantEntity {
+	@Serial private static final long serialVersionUID = 1L;
+	private Long formalSettlementId;
+	private Integer lineNo;
+	private String feeType;
+	private String feeItem;
+	private BigDecimal originalAmount;
+	private BigDecimal adjustAmount;
+	private BigDecimal settlementAmount;
+	private String remark;
+	private Integer manualFlag;
+}

blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/FormalSettlementVO.java

@@ -15,6 +15,7 @@ import org.springblade.transport.pojo.entity.FormalSettlement;
 import org.springblade.transport.pojo.entity.FormalSettlementDetail;
 import org.springblade.transport.pojo.entity.FormalSettlementSource;
 import org.springblade.transport.pojo.entity.FormalSettlementPayment;
+import org.springblade.transport.pojo.entity.FormalSettlementSummaryFee;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
@@ -39,5 +40,6 @@ public class FormalSettlementVO extends FormalSettlement {
 	@TableField(exist = false) private String preSettlementNo;
 	@TableField(exist = false) private List<FormalSettlementSource> sources;
 	@TableField(exist = false) private List<FormalSettlementDetail> details;
+	@TableField(exist = false) private List<FormalSettlementSummaryFee> summaryFees;
 	@TableField(exist = false) private List<FormalSettlementPayment> payments;
 }