新建门店状态策略属性条件排序-代码优化

gic-store-web/src/main/java/com/gic/store/web/controller/StoreStrategyController.java

@@ -67,14 +67,12 @@ public class StoreStrategyController {
                 .listStoreFieldByRegionId(regionId);
         if (storeFieldDTOServiceResponse.isSuccess()) {
             List<StoreFieldDTO> storeFieldDTOList = storeFieldDTOServiceResponse.getResult();
-            for (StoreFieldDTO storeFieldDTO : storeFieldDTOList) {
-                int storeFieldType = storeFieldDTO.getStoreFieldType();
-                boolean isRadioOrCheck = storeFieldType == StoreFieldTypeEnum.RADIO.getCode()
-                        || storeFieldType == StoreFieldTypeEnum.CHECK.getCode();
-                if (isRadioOrCheck) {
-                    result.put(storeFieldDTO.getStoreFieldId().toString(), storeFieldDTO.getStoreFieldName());
-                }
-            }
+            storeFieldDTOList
+                    .stream()
+                    .filter(e -> e != null)
+                    .filter(e -> e.getStoreFieldType().intValue() == StoreFieldTypeEnum.RADIO.getCode()
+                            || e.getStoreFieldType().intValue() == StoreFieldTypeEnum.CHECK.getCode())
+                    .forEach(e -> result.put(e.getStoreFieldId().toString(), e.getStoreFieldName()));
         }
         return RestResponse.success(result);
     }