Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreStrategyApiServiceImpl.java

@@ -218,8 +218,9 @@ public class StoreStrategyApiServiceImpl implements StoreStrategyApiService{
         searchDBDTO.setRegionIdList(regionIdList);
         searchDBDTO.setStatusList(storeStatusList);
         com.github.pagehelper.Page<StoreDTO> listStore = this.storeService.listStore(searchDBDTO, 1, Integer.MAX_VALUE);
-        for (StoreDTO store : listStore.getResult()) {
-            String result = storeStrategyService.isHitStrategy(store.getStoreInfoId(), store.getEnterpriseId(), StoreGroupConstant.STORE_GROUP_STRATEGY_TYPE);
+        List<StoreDTO> storeList = listStore.getResult();
+        for (StoreDTO store : storeList) {
+            String result = storeStrategyService.isHitStrategy(store.getStoreId(), store.getEnterpriseId(), StoreGroupConstant.STORE_GROUP_STRATEGY_TYPE);
             if (StringUtils.isNotBlank(result)) {
                 storeService.updateStoreGroupId(store.getStoreInfoId(), Integer.parseInt(result));
             }