24282 hai 1 ano
pai
achega
2624ad485b

+ 2 - 8
sd-business/src/main/java/com/sd/business/service/order/impl/OrderInfoServiceImpl.java

@@ -408,11 +408,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         List<String> priceBillingStandardIdList = Arrays.stream(priceBillingStandardIdStr.split(",")).collect(Collectors.toList());
         List<PriceBillingStandard> priceBillingStandardList = priceBillingStandardService.listByIds(priceBillingStandardIdList);
 
-        List<PriceBillingStandardDetail> priceBillingStandardDetailList = null;
+        List<PriceBillingStandardDetail> priceBillingStandardDetailList = Collections.emptyList();
 
-        if (StrUtil.isBlank(bom.getSpecies())) {
-            priceBillingStandardDetailList = Collections.emptyList();
-        } else {
+        if (StrUtil.isNotBlank(bom.getSpecies())) {
             for (PriceBillingStandard priceBillingStandard : priceBillingStandardList) {
                 if (Objects.equals(bom.getSpecies(), priceBillingStandard.getSpecies())) {
                     priceBillingStandardDetailList = priceBillingStandardDetailService.list(
@@ -420,10 +418,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     break;
                 }
             }
-
-            if (priceBillingStandardDetailList == null) {
-                throw new ServiceException("没有找到加工计费标准");
-            }
         }
 
         // 赋值