店招品牌共享标志调整

gic-store-api/src/main/java/com/gic/store/dto/StoreBrandDTO.java

@@ -57,6 +57,8 @@ public class StoreBrandDTO implements Serializable {
     /**1自有  2共享*/
     private Integer type;
 
+    private Integer fromEnterpriseId;
+
     /***********前端使用字段*********/
     /**
      * 共享标记 1:自有 0：共享
@@ -185,6 +187,15 @@ public class StoreBrandDTO implements Serializable {
         return this;
     }
 
+    public Integer getFromEnterpriseId() {
+        return fromEnterpriseId;
+    }
+
+    public StoreBrandDTO setFromEnterpriseId(Integer fromEnterpriseId) {
+        this.fromEnterpriseId = fromEnterpriseId;
+        return this;
+    }
+
     @Override
     public String toString() {
         return "StoreBrandDTO{" +
@@ -202,6 +213,7 @@ public class StoreBrandDTO implements Serializable {
                 ", type=" + type +
                 ", ownerFlag=" + ownerFlag +
                 ", ownerEntName='" + ownerEntName + '\'' +
+                ", fromEnterpriseId='" + fromEnterpriseId + '\'' +
                 '}';
     }
 }

gic-store-api/src/main/java/com/gic/store/service/StoreBrandApiService.java

@@ -58,6 +58,7 @@ public interface StoreBrandApiService {
      * @param storeBrandList
      * @return
      */
+    @Deprecated
     ServiceResponse<Map<Integer, StoreBrandShareDTO>> getStoreBrandShareEnterprise(List<StoreBrandDTO> storeBrandList);
     
     /**

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

@@ -86,14 +86,15 @@ public class StoreBrandApiServiceImpl implements StoreBrandApiService {
         List<StoreBrandDTO> resultList = page.getResult();
         int index = (pageNum - 1) * pageSize + 1;
 
-        Map<Integer, StoreBrandShareDTO> storeBrandShareDTOMap = getStoreBrandShareEnterprise(resultList).getResult();
+        Map<Integer, String> enterpriseIdMapName = enterpriseApiService.getEnterpriseIdMapName(resultList
+                .stream()
+                .mapToInt(e -> e.getFromEnterpriseId())
+                .boxed()
+                .collect(Collectors.toList()))
+                .getResult();
         for (int i = 0; i < resultList.size(); i++) {
             StoreBrandDTO storeBrandDTO = resultList.get(i);
-            StoreBrandShareDTO temp = storeBrandShareDTOMap.get(storeBrandDTO.getStoreBrandId());
-            if (temp != null) {
-                storeBrandDTO.setOwnerFlag(temp.getOwnerFlag());
-                storeBrandDTO.setOwnerEntName(temp.getOwnerEntName());
-            }
+            storeBrandDTO.setOwnerEntName(enterpriseIdMapName.get(storeBrandDTO.getFromEnterpriseId()));
             storeBrandDTO.setSeq(index + i);
         }
         return ServiceResponse.success(page);