From 222db9b9b91680c8820ad9cbb186ca4342034bd9 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Wed, 22 May 2024 19:02:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BasicdataPriceServiceImpl.java       | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

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 a72c5609e..a61b61e53 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
@@ -1822,8 +1822,13 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 						}
 					}
 					if (b && categoryFlag) {
-						// 有路径按品类计费
-						basicEntity = new BasicdataPriceCategoryBasicEntity();
+						// 有路径按品类计费 一个客户一条路径一个品类一个价格
+						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory())) {
+							basicEntity = pickupEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory());
+						} else {
+							basicEntity = new BasicdataPriceCategoryBasicEntity();
+							pickupEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory(), basicEntity);
+						}
 					} else if (b && !categoryFlag) {
 						// 有路径不按品类计费,一个客户一条路径一个价格
 						if (pickupEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId)) {
@@ -1871,9 +1876,6 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 					}
 					// 价格
 					basicEntity.setPrice(Convert.toDouble(pickupPrice));
-					if (b) {
-						basicEntities.add(basicEntity);
-					}
 				}
 				if (StrUtil.isNotEmpty(trunkLinePrice) && Convert.toDouble(trunkLinePrice) > 0) {
 					Long routeId = null;
@@ -1899,7 +1901,12 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 					}
 					if (b && categoryFlag) {
 						// 有路径按品类计费
-						basicEntity = new BasicdataPriceCategoryBasicEntity();
+						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory())) {
+							basicEntity = trunkLineEntityMap.get(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory());
+						} else {
+							basicEntity = new BasicdataPriceCategoryBasicEntity();
+							trunkLineEntityMap.put(basicExcel.getClient() + basicExcel.getBrand() + routeId + basicExcel.getCategory(), basicEntity);
+						}
 					} else if (b && !categoryFlag) {
 						// 有路径不按品类计费,一个客户一条路径一个价格
 						if (trunkLineEntityMap.containsKey(basicExcel.getClient() + basicExcel.getBrand() + routeId)) {
@@ -1947,9 +1954,6 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 					}
 					// 价格
 					basicEntity.setPrice(Convert.toDouble(trunkLinePrice));
-					if (b) {
-						basicEntities.add(basicEntity);
-					}
 				}
 				String withinThirtyPrice = basicExcel.getWithinThirtyPrice();
 				String betweenThirtySixtyPrice = basicExcel.getBetweenThirtySixtyPrice();