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

haoban-manage3-web/pom.xml

@@ -68,6 +68,11 @@
 		</dependency>
 		<dependency>
 			<groupId>com.gic</groupId>
+			<artifactId>gic-wechat-token-api</artifactId>
+			<version>${gic-wechat-token-api}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.gic</groupId>
 			<artifactId>gic-commons</artifactId>
 			<version>${gic-commons}</version>
 			<exclusions>

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

@@ -25,19 +25,24 @@ import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.DepartmentDTO;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
+import com.gic.haoban.manage.api.dto.QywxCorpInfoSimpleDTO;
+import com.gic.haoban.manage.api.dto.WxApplicationDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.YwWxEnterpriseDTO;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
+import com.gic.haoban.manage.api.service.WxApplicationApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseRelatedApiService;
 import com.gic.haoban.manage.web.anno.HttpLimit;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
+import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
 import com.gic.wechat.api.service.qywx.QywxCorpApiService;
-import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
+import com.gic.wechat.token.api.dto.QywxCorpInfoDTO;
+import com.gic.wechat.token.api.service.QywxTokenManageService;
 
 @RestController
 public class WxEnterpriseController extends WebBaseController{
@@ -52,7 +57,11 @@ public class WxEnterpriseController extends WebBaseController{
 	@Autowired
 	private StoreService storeService;
 	@Autowired
-	private QywxCorpApiService qywxCorpApiService;
+	private QywxTokenManageService qywxTokenManageService;
+	@Autowired
+	private WxApplicationApiService wxApplicationApiService;
+	@Autowired
+	private Config config;
 	
 	//授权企业列表
 	@HttpLimit
@@ -98,9 +107,17 @@ public class WxEnterpriseController extends WebBaseController{
 		if(StringUtils.isEmpty(wxEnterpriseId)){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
-		//qywxCorpApiService.
 		WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(wxEnterpriseId);
-		
+		if(wxEnterpriseDTO == null){
+			return resultResponse(HaoBanErrCode.ERR_10012);
+		}
+		QywxCorpInfoDTO dto = qywxTokenManageService.getCorpInfo(wxEnterpriseDTO.getCorpid(), config.getSuiteId());
+		if(dto == null){
+			return resultResponse(HaoBanErrCode.ERR_10012);
+		}
+		WxEnterpriseDTO wxDTO = EntityUtil.changeEntityByJSON(WxEnterpriseDTO.class, dto);
+		wxDTO.setWxEnterpriseId(wxEnterpriseId);
+		wxEnterpriseApiService.update(wxDTO);
 		return resultResponse(HaoBanErrCode.ERR_1,wxEnterpriseDTO);
 	}
 	//gic企业列表

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -80,6 +80,8 @@ public enum HaoBanErrCode {
     ERR_10009(10009,"门店不存在"),
     ERR_10010(10010,"企业微信无关联的gic企业"),
     ERR_10011(10011,"正在同步中，请等待结束再操作"),
+    
+    ERR_10012(10012,"企业微信不存在"),
 
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/DepartmentVO.java

@@ -32,6 +32,8 @@ public class DepartmentVO implements Serializable{
     private Boolean hasSonNode;
     
     private String enterpriseId;
+    
+    private String relatedCode;
 
 	public String getDepartmentId() {
 		return departmentId;
@@ -144,6 +146,14 @@ public class DepartmentVO implements Serializable{
 	public void setEnterpriseId(String enterpriseId) {
 		this.enterpriseId = enterpriseId;
 	}
+
+	public String getRelatedCode() {
+		return relatedCode;
+	}
+
+	public void setRelatedCode(String relatedCode) {
+		this.relatedCode = relatedCode;
+	}
     
     
 

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

@@ -50,5 +50,6 @@
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.AuditSettingApiService" id="auditSettingApiService"/>
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.DictApiService" id="dictApiService"/>
 	
+	<dubbo:reference interface="com.gic.wechat.token.api.service.QywxTokenManageService" id="qywxTokenManageService"/>
 	
 </beans>