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 a2792c54b..0aff8b488 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 @@ -1893,7 +1893,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl categoryEntityMap, Map dispatchAddEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) { // 配送是否附加费 Integer dispatchIsAddFee = templateEntity.getDispatchIsAddFee(); - if(ObjectUtil.isEmpty(dispatchIsAddFee) || ObjectUtil.equal(dispatchIsAddFee, BooleanZeroOneEnums.NO.getCode())){ + if (ObjectUtil.isEmpty(dispatchIsAddFee) || ObjectUtil.equal(dispatchIsAddFee, BooleanZeroOneEnums.NO.getCode())) { return; } Integer pickupIsByCategory = templateEntity.getDispatchIsByCategory(); @@ -2010,7 +2010,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl categoryEntityMap, Map warehouseAddEntityMap, BasicdataPriceCategoryV2Excel basicExcel, BasicdataPriceEntity priceEntity, BasicdataPriceTemplateEntity templateEntity) { // 仓储是否附加费 Integer warehouseIsAddFee = templateEntity.getWarehouseIsAddFee(); - if(ObjectUtil.isEmpty(warehouseIsAddFee) || ObjectUtil.equal(warehouseIsAddFee, BooleanZeroOneEnums.NO.getCode())){ + if (ObjectUtil.isEmpty(warehouseIsAddFee) || ObjectUtil.equal(warehouseIsAddFee, BooleanZeroOneEnums.NO.getCode())) { return; } Integer pickupIsByCategory = templateEntity.getWarehouseIsCategorySubjoin(); @@ -2822,7 +2822,13 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl categoryEntityMap, StringBuilder rowMessage, String category) { if (StrUtil.isNotEmpty(category)) { if (!categoryEntityMap.containsKey(category)) {