feat(all): 修改价格导入失败问题

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