添加授予商户的name返回

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

@@ -37,6 +37,7 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     private Integer isEditStoreGroup;
 
     private Integer fromEnterpriseId;
+    private String fromEnterpriseName;
 
 
     public Integer getStoreId() {
@@ -110,4 +111,12 @@ public class StoreDTO extends StoreInfoDTO implements Serializable {
     public void setFromEnterpriseId(Integer fromEnterpriseId) {
         this.fromEnterpriseId = fromEnterpriseId;
     }
+
+    public void setFromEnterpriseName(String fromEnterpriseName) {
+        this.fromEnterpriseName = fromEnterpriseName;
+    }
+
+    public String getFromEnterpriseName() {
+        return fromEnterpriseName;
+    }
 }
\ No newline at end of file

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

@@ -8,8 +8,10 @@ import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.commons.util.PageHelperUtils;
+import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.search.business.api.constant.enums.OperateEnum;
 import com.gic.search.business.api.dto.DynamicDocDTO;
@@ -74,6 +76,8 @@ public class StoreApiServiceImpl implements StoreApiService {
     private StoreRegionService storeRegionService;
     @Autowired
     private EsBusinessOperaApiService esBusinessOperaApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     static {
         storeStrtegyMap.put(1, new StoreStatusStrategyImpl());
@@ -417,6 +421,14 @@ public class StoreApiServiceImpl implements StoreApiService {
         List<TabStoreExtend> extendList = storeExtendService.listByStoreInfoId(enterpriseId, storeId);
         List<StoreExtendDTO> extendDTOList = storeExtendService.convertStoreExtendToDTO(extendList);
         storeDTO.setStoreExtendList(extendDTOList);
+        Integer fromEnterpriseId = storeDTO.getFromEnterpriseId();
+        if (fromEnterpriseId != null) {
+            ServiceResponse<EnterpriseDTO> serviceResponse = enterpriseApiService.getEnterpriseById(fromEnterpriseId);
+            if (serviceResponse.isSuccess()) {
+                EnterpriseDTO enterpriseDTO = serviceResponse.getResult();
+                storeDTO.setFromEnterpriseName(enterpriseDTO.getEnterpriseName());
+            }
+        }
         return storeDTO;
     }