bug

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

@@ -2,6 +2,7 @@ package com.gic.store.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.store.constant.StoreESFieldsEnum;
@@ -9,7 +10,9 @@ import com.gic.store.dto.StoreBrandDTO;
 import com.gic.store.dto.StoreDTO;
 import com.gic.store.dto.StoreSearchDTO;
 import com.gic.store.dto.StoreWidgetDTO;
+import com.gic.store.entity.TabStoreBrand;
 import com.gic.store.service.StoreApiService;
+import com.gic.store.service.StoreBrandService;
 import com.gic.store.service.StoreWidgetApiService;
 import com.gic.store.service.StoreWidgetService;
 import org.apache.commons.collections.CollectionUtils;
@@ -26,6 +29,8 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
     private StoreWidgetService storeWidgetService;
     @Autowired
     private StoreApiService storeApiService;
+    @Autowired
+    private StoreBrandService storeBrandService;
 
     @Override
     public ServiceResponse<Integer> saveStoreWidget(StoreWidgetDTO storeWidgetDTO) {
@@ -167,13 +172,16 @@ public class StoreWidgetApiServiceImpl implements StoreWidgetApiService {
             return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         }
         List<StoreDTO> list = serviceResponse.getResult().getResult();
+        List<Integer> brandIdList = new ArrayList<>();
         List<StoreBrandDTO> brandList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(list)) {
             for (StoreDTO storeDTO : list) {
-                if (CollectionUtils.isNotEmpty(storeDTO.getBrandList())) {
-                    brandList.addAll(storeDTO.getBrandList());
+                if (CollectionUtils.isNotEmpty(storeDTO.getStoreBrandIdList())) {
+                    brandIdList.addAll(storeDTO.getStoreBrandIdList());
                 }
             }
+            List<TabStoreBrand> tabStoreBrands = storeBrandService.listStoreBrandByIds(brandIdList);
+            brandList = EntityUtil.changeEntityListByJSON(StoreBrandDTO.class, tabStoreBrands);
         }
         return EnterpriseServiceResponse.success(brandList);
     }