Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/pom.xml

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

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -6,6 +6,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
@@ -15,6 +17,8 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 public class WxEnterpriseController extends WebBaseController{
 	@Autowired
 	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+	@Autowired
+	private EnterpriseService enterpriseService;
 	//授权企业列表
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList() {
@@ -23,6 +27,14 @@ public class WxEnterpriseController extends WebBaseController{
 		return resultResponse(HaoBanErrCode.ERR_1, list);
  
 	}
+	
+	//gic企业列表
+	@RequestMapping("gic-enterprise-detail")
+	public HaobanResponse gicEnterpriseDetail(String search) {
+		EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(search);
+		return resultResponse(HaoBanErrCode.ERR_1,dto);
+ 
+	}
 	//微信企业绑定接口
 	@RequestMapping("wx-enterprise-bind")
 	public HaobanResponse wxEnterpriseBind(String enterpriseId,String wxEnterpriseId,String version) {
@@ -31,4 +43,5 @@ public class WxEnterpriseController extends WebBaseController{
  
 	}
 	
+
 }

haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml

@@ -23,6 +23,8 @@
     <dubbo:reference interface="com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService" id="wxEnterpriseRelatedApiService" />
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.ApplicationApiService" id="applicationApiService"/>
 	
+	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>
+	
 	<dubbo:reference interface="com.gic.enterprise.api.service.StoreService" id="storeService"/>
 	<dubbo:reference interface="com.gic.enterprise.api.service.DepartmentService" id="departmentService"/>
 </beans>