门店域加上共享标志

pom.xml

@@ -161,6 +161,11 @@
             <artifactId>gic-platform-auth-api </artifactId>
             <version>${gic-platform-auth-api} </version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-platform-enterprise-api</artifactId>
+            <version>${gic-platform-enterprise-api}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.gic </groupId>

src/main/java/com/gic/plug/web/controller/StoreController.java

 package com.gic.plug.web.controller;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.api.base.commons.Page;
+import com.gic.enterprise.dto.EnterpriseDTO;
+import com.gic.enterprise.service.EnterpriseApiService;
+import com.gic.plug.web.vo.widget.StoreWidgetInterfaceShareVO;
 import com.gic.plug.web.vo.widget.StoreWidgetInterfaceVO;
 import com.gic.store.dto.StoreDTO;
 import org.apache.commons.collections.CollectionUtils;
@@ -66,6 +67,8 @@ public class StoreController {
     private StoreWidgetLogApiService storeWidgetLogApiService;
     @Autowired
     private ResourceGroupApiService resourceGroupApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     @RequestMapping("/list-store-region")
     public RestResponse listStoreRegion(String search) {
@@ -76,16 +79,41 @@ public class StoreController {
         if (serviceResponse.isSuccess()) {
             List<StoreRegionDTO> result = serviceResponse.getResult();
 
-            List<StoreWidgetInterfaceVO> voList = new ArrayList<>();
-            for(StoreRegionDTO storeRegionDTO : result){
+            if (CollectionUtils.isEmpty(result)) {
+                return RestResponse.success();
+            }
+            List<Integer> ownEnterpriseIdList = result.stream()
+                    .filter(e -> !e.getEnterpriseId().equals(e.getFromEnterpriseId()))
+                    .mapToInt(e -> e.getFromEnterpriseId()).boxed()
+                    .collect(Collectors.toList());
+
+            ServiceResponse<List<EnterpriseDTO>> enterpriseResponse = enterpriseApiService.listEnterpriseByIds(ownEnterpriseIdList);
+            List<EnterpriseDTO> enterpriseList = enterpriseResponse.getResult();
+            Map<Integer, String> enterpriseMap = enterpriseList.stream().collect(Collectors.toMap(e -> e.getEnterpriseId(), e -> e.getEnterpriseName()));
+
+
+            List<StoreWidgetInterfaceShareVO> voList;
+
             if (!authRegionSet.isEmpty()) {
-                    if(authRegionSet.contains(storeRegionDTO.getRegionId()+"")){
-                        voList.add(new StoreWidgetInterfaceVO().setLabel(storeRegionDTO.getRegionName()).setValue(storeRegionDTO.getRegionId().toString()));
+                voList = result.stream().filter(e -> authRegionSet.contains(e.getRegionId() + "")).map(e -> {
+                    StoreWidgetInterfaceShareVO vo = new StoreWidgetInterfaceShareVO();
+                    vo.setLabel(e.getRegionName()).setValue(e.getRegionId().toString());
+                    if (!Objects.equals(e.getFromEnterpriseId(), e.getEnterpriseId())) {
+                        vo.setEnterpriseName(enterpriseMap.get(e.getFromEnterpriseId()));
                     }
-                 }else {
-                    voList.add(new StoreWidgetInterfaceVO().setLabel(storeRegionDTO.getRegionName()).setValue(storeRegionDTO.getRegionId().toString()));
+                    return vo;
+                }).collect(Collectors.toList());
+            } else {
+                voList = result.stream().map(e -> {
+                    StoreWidgetInterfaceShareVO vo = new StoreWidgetInterfaceShareVO();
+                    vo.setLabel(e.getRegionName()).setValue(e.getRegionId().toString());
+                    if (!Objects.equals(e.getFromEnterpriseId(), e.getEnterpriseId())) {
+                        vo.setEnterpriseName(enterpriseMap.get(e.getFromEnterpriseId()));
                     }
+                    return vo;
+                }).collect(Collectors.toList());
             }
+
             return RestResponse.success(voList);
         } else {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());

src/main/java/com/gic/plug/web/vo/widget/StoreWidgetInterfaceShareVO.java

+package com.gic.plug.web.vo.widget;
+
+import java.io.Serializable;
+/**
+ * 门店选择器的接口的返回字段统一(有共享标志的)
+ * @ClassName:
+ * @Description: 

+ * @author guojuxing

+ * @date 2021/2/26 10:32 AM

+ */
+public class StoreWidgetInterfaceShareVO implements Serializable{
+    private static final long serialVersionUID = 5702818425942819867L;
+
+    /**
+     * 后端的值
+     */
+    private String value;
+
+    /**
+     * 展示字段
+     */
+    private String label;
+
+    /**
+     * 自有商户名称
+     */
+    private String enterpriseName;
+
+    public String getValue() {
+        return value;
+    }
+
+    public StoreWidgetInterfaceShareVO setValue(String value) {
+        this.value = value;
+        return this;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public StoreWidgetInterfaceShareVO setLabel(String label) {
+        this.label = label;
+        return this;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public StoreWidgetInterfaceShareVO setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "StoreWidgetInterfaceShareVO{" +
+                "value='" + value + '\'' +
+                ", label='" + label + '\'' +
+                ", enterpriseName='" + enterpriseName + '\'' +
+                '}';
+    }
+}

src/main/resources/dubbo-gic-webapp-plug.xml

@@ -64,4 +64,5 @@
 
     <dubbo:reference interface="com.gic.store.service.StoreWidgetLogApiService" id="storeWidgetLogApiService" timeout="6000"/>
     <dubbo:reference interface="com.gic.auth.service.ResourceGroupApiService" id="resourceGroupApiService" timeout="6000"/>
+    <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>
 </beans>
\ No newline at end of file