feat(all): 价格体系-仓储配送增加是否附加费控制

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 = "配送-是否有操作/装卸费")

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);