From e4239056bf8ef9f9793af6389ebfaa465f1f0773 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Mon, 13 May 2024 09:47:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BB=B7=E6=A0=BC=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB-=E4=BB=93=E5=82=A8=E9=85=8D=E9=80=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E9=99=84=E5=8A=A0=E8=B4=B9=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/basicdata/entity/BasicdataPriceTemplateEntity.java  | 4 ++++
 .../service/impl/BasicdataPriceTemplateServiceImpl.java       | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java
index 9ebdc8120..0ce2a8f3e 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataPriceTemplateEntity.java
@@ -104,6 +104,8 @@ public class BasicdataPriceTemplateEntity extends TenantEntity {
 	private String warehousePieceCategory;
 	@ApiModelProperty(value = "仓储-附加费计价单位")
 	private Integer warehouseSubjoinFeeUnit;
+	@ApiModelProperty(value = "仓储-是否附加费")
+	private Integer warehouseIsAddFee;
 	@ApiModelProperty(value = "仓储-是否有管理费")
 	private Integer warehouseIsManageFee;
 	@ApiModelProperty(value = "仓储-是否有操作/装卸费")
@@ -130,6 +132,8 @@ public class BasicdataPriceTemplateEntity extends TenantEntity {
 	private String dispatchWeightCategory;
 	@ApiModelProperty(value = "配送-是否按品类附加费计费")
 	private Integer dispatchIsCategorySubjoin;
+	@ApiModelProperty(value = "配送-是否附加费")
+	private Integer dispatchIsAddFee;
 	@ApiModelProperty(value = "配送-是否有分货费")
 	private Integer dispatchIsSortFee;
 	@ApiModelProperty(value = "配送-是否有操作/装卸费")
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
index f4312e4d2..04c83fe80 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceTemplateServiceImpl.java
@@ -160,6 +160,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 				if (ObjectUtil.isEmpty(warehousePricingType)) {
 					throw new ServiceException("请选择仓储计价方式");
 				}
+				priceTemplateEntity.setWarehouseIsAddFee(basicdataPriceTemplate.getWarehouseIsAddFee());
 				priceTemplateEntity.setWarehousePricingType(basicdataPriceTemplate.getWarehousePricingType());
 				priceTemplateEntity.setWarehousePricingMode(basicdataPriceTemplate.getWarehousePricingMode());
 				priceTemplateEntity.setWarehouseCalculationBasis(basicdataPriceTemplate.getWarehouseCalculationBasis());
@@ -177,6 +178,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 				if (StrUtil.isEmpty(dispatchPricingType)) {
 					throw new ServiceException("请选择配送计价方式");
 				}
+				priceTemplateEntity.setDispatchIsAddFee(basicdataPriceTemplate.getDispatchIsAddFee());
 				priceTemplateEntity.setDispatchServiceType(basicdataPriceTemplate.getDispatchServiceType());
 				priceTemplateEntity.setDispatchPricingType(basicdataPriceTemplate.getDispatchPricingType());
 				priceTemplateEntity.setDispatchIsByCategory(basicdataPriceTemplate.getDispatchIsByCategory());
@@ -270,6 +272,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 				templateEntity.setTrunklineMinCostType(MinCostTypeEnums.PRICE.getCode());
 				break;
 			case WAREHOUSE:
+				templateEntity.setWarehouseIsAddFee(0);
 				templateEntity.setWarehousePricingType(WarehousePricingTypeEnums.PIECE.getCode());
 				templateEntity.setWarehousePricingMode(WarehousePricingModeEnums.SEGMENTED_CHARGING.getCode());
 				templateEntity.setWarehouseCalculationBasis(WarehouseCalculationBasisEnums.PIECE_PER_DAY.getCode());
@@ -283,6 +286,7 @@ public class BasicdataPriceTemplateServiceImpl extends BaseServiceImpl<Basicdata
 				templateEntity.setWarehouseSubjoinCategory("");
 				break;
 			case DISPATCH:
+				templateEntity.setDispatchIsAddFee(0);
 				templateEntity.setDispatchServiceType(DispatchTypeEnums.COMMERCIAL_DISTRIBUTION.getCode());
 				templateEntity.setDispatchPricingType("");
 				templateEntity.setDispatchIsByCategory(0);