From 3622fa907cbe2febdc5a0d39547a32afdf730cf7 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Fri, 19 Apr 2024 11:30:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BC=98=E5=8C=96=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E4=BD=93=E7=B3=BB=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/enums/FullVehicleTypeEnums.java  |  4 ++--
 .../impl/BasicdataPriceServiceImpl.java        | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java
index 38f7f7a0a..2ad5f0f67 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/enums/FullVehicleTypeEnums.java
@@ -11,8 +11,8 @@ import org.springblade.common.model.IDict;
 public enum FullVehicleTypeEnums implements IDict<Integer> {
 
 	PICK_UP(1, "提货整车"),
-	TRUNK_LINE(2, "配送干线整车"),
-	DISPATCH(4, "整车"),
+	TRUNK_LINE(2, "干线整车"),
+	DISPATCH(4, "配送整车"),
 	;
 
 	FullVehicleTypeEnums(Integer code, String text) {
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
index 55c2729e4..5e6d79ced 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java
@@ -307,8 +307,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (StrUtil.contains(serviceType, ServiceTypeEnums.PICK_UP.getCode().toString())) {
 			// 提货不按区域计费
 			Integer pickupIsUnifyAreaBill = templateEntity.getPickupIsUnifyAreaBill();
-			if (ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode())) {
-				priceClientVO.setPickup(initPickUp(priceEntity, templateEntity, fullMap.get(1), basicMap.get(1), generalMap.get(1)));
+			if (ObjectUtil.equal(pickupIsUnifyAreaBill, BooleanZeroOneEnums.YES.getCode())) {
+				priceClientVO.setPickup(initPickUp(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.PICK_UP.getCode()), basicMap.get(ServiceTypeEnums.PICK_UP.getCode()), generalMap.get(GeneralServiceTypeEnums.PICK_UP.getCode())));
 			} else {
 				// 按区域计费，查询路径，返回价格
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
@@ -336,7 +336,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			Integer trunklineIsUnifyAreaBill = templateEntity.getTrunklineIsUnifyAreaBill();
 			// 干线不按区域计费
 			if (ObjectUtil.equal(trunklineIsUnifyAreaBill, BooleanZeroOneEnums.NO.getCode())) {
-				priceClientVO.setTrunkLine(initTrunkLine(priceEntity, templateEntity, fullMap.get(2), basicMap.get(3), generalMap.get(3)));
+				priceClientVO.setTrunkLine(initTrunkLine(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.TRUNK_LINE.getCode()),
+					basicMap.get(ServiceTypeEnums.TRUNK_LINE.getCode()), generalMap.get(GeneralServiceTypeEnums.TRUNK_LINE.getCode())));
 			} else {
 				// 按区域计费，查询路径，返回价格
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
@@ -365,7 +366,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		}
 		// 配送费
 		if (StrUtil.contains(serviceType, ServiceTypeEnums.DISPATCH.getCode().toString())) {
-			priceClientVO.setDispatch(initDispatch(priceEntity, templateEntity, fullMap.get(3), dispatchMap, generalMap.get(5), generalMap.get(6)));
+			priceClientVO.setDispatch(initDispatch(priceEntity, templateEntity, fullMap.get(FullVehicleTypeEnums.DISPATCH.getCode()),
+				dispatchMap, generalMap.get(GeneralServiceTypeEnums.DISPATCH.getCode()), generalMap.get(GeneralServiceTypeEnums.DISPATCH_LEAVE_BEHIND.getCode())));
 		}
 		priceClientVO.setTemplate(templateEntity);
 		return priceClientVO;
@@ -455,7 +457,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		String dispatchPricingType = templateEntity.getDispatchPricingType();
 		//品类
 		Map<Integer, List<BasicdataPriceCategoryDispatchEntity>> categoryBasicMap = new HashMap<>();
-		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities = dispatchMap.get(1);
+		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities = dispatchMap.get(CostTypeEnums.NOMAL.getCode());
 		if (CollUtil.isNotEmpty(dispatchEntities)) {
 			// 将数据放到categoryBasicMap中
 			dispatchEntities.forEach(item -> {
@@ -560,7 +562,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			priceDispatchVO.setTonKilometerCost(basicVOList);
 		}
 		//附加费
-		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities1 = dispatchMap.get(2);
+		List<BasicdataPriceCategoryDispatchEntity> dispatchEntities1 = dispatchMap.get(CostTypeEnums.ADD.getCode());
 		if (CollUtil.isNotEmpty(dispatchEntities1)) {
 			List<PriceDispatchAdditionalVO> basicVOList = new ArrayList<>();
 			dispatchEntities1.forEach(item -> {
@@ -592,7 +594,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		PriceWarehouseVO priceWarehouseVO = new PriceWarehouseVO();
 		Integer warehousePricingType = templateEntity.getWarehousePricingType();
 		Map<Integer, List<BasicdataPriceCategoryWarehouseEntity>> categoryBasicMap = new HashMap<>();
-		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities = warehouseMap.get(1);
+		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities = warehouseMap.get(CostTypeEnums.NOMAL.getCode());
 		if (CollUtil.isNotEmpty(warehouseEntities)) {
 			warehouseEntities.forEach(item -> {
 				Integer type = item.getType();
@@ -647,7 +649,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 			}
 		}
 		// 附加费
-		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities1 = warehouseMap.get(2);
+		List<BasicdataPriceCategoryWarehouseEntity> warehouseEntities1 = warehouseMap.get(CostTypeEnums.ADD.getCode());
 		if (CollUtil.isNotEmpty(warehouseEntities1)) {
 			List<PriceWarehouseAdditionalVO> additionalVOS = warehouseEntities1.stream().map(item -> {
 				PriceWarehouseAdditionalVO additionalVO = new PriceWarehouseAdditionalVO();